Skip to content

Commit 2c603b5

Browse files
mcbartonVipul-Cariappa
authored andcommitted
Speed up ci
1 parent 8757c17 commit 2c603b5

File tree

1 file changed

+31
-35
lines changed

1 file changed

+31
-35
lines changed

.github/workflows/Ubuntu.yml

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,44 +22,44 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
include:
25-
- name: ubu22-x86-gcc12-clang-repl-19
26-
os: ubuntu-22.04
25+
- name: ubu24-x86-gcc12-clang-repl-19
26+
os: ubuntu-24.04
2727
compiler: gcc-12
2828
clang-runtime: '19'
2929
cling: Off
3030
llvm_enable_projects: "clang"
3131
llvm_targets_to_build: "host;NVPTX"
32-
- name: ubu22-x86-gcc12-clang-repl-18
33-
os: ubuntu-22.04
32+
- name: ubu24-x86-gcc12-clang-repl-18
33+
os: ubuntu-24.04
3434
compiler: gcc-12
3535
clang-runtime: '18'
3636
cling: Off
3737
llvm_enable_projects: "clang"
3838
llvm_targets_to_build: "host;NVPTX"
39-
- name: ubu22-x86-gcc9-clang18-cling
40-
os: ubuntu-22.04
39+
- name: ubu24-x86-gcc9-clang18-cling
40+
os: ubuntu-24.04
4141
compiler: gcc-9
4242
clang-runtime: '18'
4343
cling: On
4444
cling-version: '1.2'
4545
llvm_enable_projects: "clang"
4646
llvm_targets_to_build: "host;NVPTX"
47-
- name: ubu22-arm-gcc12-clang-repl-19
48-
os: ubuntu-22.04-arm
47+
- name: ubu24-arm-gcc12-clang-repl-19
48+
os: ubuntu-24.04-arm
4949
compiler: gcc-12
5050
clang-runtime: '19'
5151
cling: Off
5252
llvm_enable_projects: "clang"
5353
llvm_targets_to_build: "host;NVPTX"
54-
- name: ubu22-arm-gcc12-clang-repl-18
55-
os: ubuntu-22.04-arm
54+
- name: ubu24-arm-gcc12-clang-repl-18
55+
os: ubuntu-24.04-arm
5656
compiler: gcc-12
5757
clang-runtime: '18'
5858
cling: Off
5959
llvm_enable_projects: "clang"
6060
llvm_targets_to_build: "host;NVPTX"
61-
- name: ubu22-arm-gcc9-clang18-cling
62-
os: ubuntu-22.04-arm
61+
- name: ubu24-arm-gcc9-clang18-cling
62+
os: ubuntu-24.04-arm
6363
compiler: gcc-9
6464
clang-runtime: '18'
6565
cling: On
@@ -245,39 +245,41 @@ jobs:
245245
fail-fast: false
246246
matrix:
247247
include:
248-
- name: ubu22-x86-gcc12-clang-repl-19-cppyy
249-
os: ubuntu-22.04
248+
- name: ubu24-x86-gcc12-clang-repl-19-cppyy
249+
os: ubuntu-24.04
250250
compiler: gcc-12
251251
clang-runtime: '19'
252252
cling: Off
253253
cppyy: On
254-
- name: ubu22-x86-gcc12-clang-repl-18-cppyy
255-
os: ubuntu-22.04
254+
Valgrind: On
255+
- name: ubu24-x86-gcc12-clang-repl-18-cppyy
256+
os: ubuntu-24.04
256257
compiler: gcc-12
257258
clang-runtime: '18'
258259
cling: Off
259260
cppyy: On
260-
- name: ubu22-x86-gcc9-clang18-cling-cppyy
261-
os: ubuntu-22.04
261+
- name: ubu24-x86-gcc9-clang18-cling-cppyy
262+
os: ubuntu-24.04
262263
compiler: gcc-9
263264
clang-runtime: '18'
264265
cling: On
265266
cling-version: '1.2'
266267
cppyy: On
267-
- name: ubu22-arm-gcc12-clang-repl-19
268-
os: ubuntu-22.04-arm
268+
- name: ubu24-arm-gcc12-clang-repl-19-cppyy
269+
os: ubuntu-24.04-arm
269270
compiler: gcc-12
270271
clang-runtime: '19'
271272
cling: Off
272-
cppyy: Off
273-
- name: ubu22-arm-gcc12-clang-repl-18
274-
os: ubuntu-22.04-arm
273+
cppyy: On
274+
Valgrind: On
275+
- name: ubu24-arm-gcc12-clang-repl-18-cppyy
276+
os: ubuntu-24.04-arm
275277
compiler: gcc-12
276278
clang-runtime: '18'
277279
cling: Off
278-
cppyy: Off
279-
- name: ubu22-arm-gcc9-clang18-cling-cppyy
280-
os: ubuntu-22.04-arm
280+
cppyy: On
281+
- name: ubu24-arm-gcc9-clang18-cling-cppyy
282+
os: ubuntu-24.04-arm
281283
compiler: gcc-9
282284
clang-runtime: '18'
283285
cling: On
@@ -436,14 +438,6 @@ jobs:
436438
-DLLVM_ENABLE_WERROR=On \
437439
../
438440
fi
439-
docs_on=$(echo "${{ matrix.documentation }}" | tr '[:lower:]' '[:upper:]')
440-
if [[ "${docs_on}" == "ON" ]]; then
441-
cmake --build . --target doxygen-cppinterop --parallel ${{ env.ncpus }}
442-
cmake --build . --target sphinx-cppinterop --parallel ${{ env.ncpus }}
443-
else
444-
cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
445-
valgrind --show-error-list=yes --track-origins=yes --error-exitcode=1 unittests/CppInterOp/CppInterOpTests/unittests/bin/${{ env.BUILD_TYPE }}/CppInterOpTests
446-
fi
447441
cd ..
448442
# We need CB_PYTHON_DIR later
449443
echo "CB_PYTHON_DIR=$CB_PYTHON_DIR" >> $GITHUB_ENV
@@ -572,7 +566,9 @@ jobs:
572566
SUPPRESSION_FILE="../etc/${CLANG_INTERPRETER}${CLANG_VERSION}-valgrind.supp"
573567
fi
574568
export IS_VALGRIND=true
575-
valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -sv -ra
569+
if [[ "${{ matrix.Valgrind }}" == "On" ]]; then
570+
valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -sv -ra
571+
fi
576572
unset IS_VALGRIND
577573
export RETCODE=+$?
578574
echo ::endgroup::

0 commit comments

Comments
 (0)