Skip to content

Commit 301d996

Browse files
authored
Merge pull request #2423 from elBoberido/iox-2011-fix-ci-on-release-2.0
iox-#2011 Fix CI on release 2.0 branch
2 parents ebdf387 + 2e768c3 commit 301d996

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

.github/workflows/build-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ on:
1111

1212
jobs:
1313
pre-flight-check:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
steps:
1616
- uses: actions/checkout@v4
1717
- run: ./tools/scripts/clang_format.sh check
1818

1919
build-test-ubuntu:
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121
needs: pre-flight-check
2222
steps:
2323
- uses: actions/checkout@v4
@@ -69,7 +69,7 @@ jobs:
6969
- run: ./tools/ci/run-integration-test.sh
7070

7171
build-test-ubuntu-with-sanitizers-gcc-latest:
72-
runs-on: ubuntu-20.04
72+
runs-on: ubuntu-22.04
7373
needs: pre-flight-check
7474
steps:
7575
- uses: egor-tensin/[email protected]
@@ -80,7 +80,7 @@ jobs:
8080
- run: ./tools/ci/build-test-ubuntu-with-sanitizers.sh gcc
8181

8282
build-test-ubuntu-with-sanitizers-clang-latest:
83-
runs-on: ubuntu-20.04
83+
runs-on: ubuntu-22.04
8484
needs: pre-flight-check
8585
steps:
8686
- uses: egor-tensin/setup-clang@v1
@@ -100,7 +100,7 @@ jobs:
100100
- run: ./tools/ci/build-test-macos-with-sanitizers.sh
101101

102102
coverage-and-docs:
103-
runs-on: ubuntu-20.04
103+
runs-on: ubuntu-22.04
104104
needs: pre-flight-check
105105
steps:
106106
- uses: actions/checkout@v4

tools/ci/build-test-macos-with-sanitizers.sh

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,14 @@ $(clang --version)"
3131

3232
msg "building and installing dependencies"
3333
# tinfo library which is required by iceoryx_introspection isn't available in mac
34-
brew install ncurses wget
35-
mkdir -p bison_build
36-
cd bison_build
37-
wget https://ftp.gnu.org/gnu/bison/bison-3.5.1.tar.gz
38-
tar -xvf bison-3.5.1.tar.gz
39-
cd bison-3.5.1
40-
./configure
41-
make
42-
sudo make install
34+
brew install ncurses bison
4335
cd "${WORKSPACE}"
4436

4537
msg "building sources"
46-
export LDFLAGS="-L/usr/local/opt/ncurses/lib"
47-
export CFLAGS="-I/usr/local/opt/ncurses/include"
38+
export PATH="$(brew --prefix bison)/bin:$PATH"
39+
export LDFLAGS="$LDFLAGS -L/usr/local/opt/bison/lib"
40+
export LDFLAGS="$LDFLAGS -L/usr/local/opt/ncurses/lib"
41+
export CFLAGS="$CFLAGS -I/usr/local/opt/ncurses/include"
4842
./tools/iceoryx_build_test.sh build-strict build-all sanitize
4943

5044
msg "running tests (excluding timing_tests)"

0 commit comments

Comments
 (0)