Skip to content

Commit eeecac0

Browse files
aaronj0aaronj0
committed
Migrate CI to Ubuntu 24
1 parent ecbffaf commit eeecac0

File tree

1 file changed

+41
-43
lines changed

1 file changed

+41
-43
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- name: ubu22-x86-gcc12-clang-repl-18
25-
os: ubuntu-22.04
26-
compiler: gcc-12
24+
- name: ubu24-x86-gcc13-clang-repl-18
25+
os: ubuntu-24.04
26+
compiler: gcc-13
2727
clang-runtime: '18'
2828
cling: Off
2929
cppyy: On
3030
coverage: true
31-
- name: ubu22-x86-gcc12-clang-repl-17
32-
os: ubuntu-22.04
33-
compiler: gcc-12
31+
- name: ubu24-x86-gcc13-clang-repl-17
32+
os: ubuntu-24.04
33+
compiler: gcc-13
3434
clang-runtime: '17'
3535
cling: Off
3636
cppyy: On
3737
coverage: true
38-
- name: ubu22-x86-gcc12-clang-repl-16
39-
os: ubuntu-22.04
40-
compiler: gcc-12
38+
- name: ubu24-x86-gcc13-clang-repl-16
39+
os: ubuntu-24.04
40+
compiler: gcc-13
4141
clang-runtime: '16'
4242
cling: Off
4343
cppyy: On
4444
coverage: true
45-
- name: ubu22-x86-gcc9-clang13-cling
46-
os: ubuntu-22.04
47-
compiler: gcc-9
45+
- name: ubu24-x86-gcc13-clang13-cling
46+
os: ubuntu-24.04
47+
compiler: gcc-13
4848
clang-runtime: '13'
4949
cling: On
5050
cling-version: '1.0'
@@ -470,28 +470,28 @@ jobs:
470470
fail-fast: false
471471
matrix:
472472
include:
473-
- name: ubu22-x86-gcc12-clang-repl-18-cppyy
474-
os: ubuntu-22.04
475-
compiler: gcc-12
473+
- name: ubu24-x86-gcc13-clang-repl-18-cppyy
474+
os: ubuntu-24.04
475+
compiler: gcc-13
476476
clang-runtime: '18'
477477
cling: Off
478478
cppyy: On
479479
coverage: true
480-
- name: ubu22-x86-gcc12-clang-repl-17-cppyy
481-
os: ubuntu-22.04
482-
compiler: gcc-12
480+
- name: ubu24-x86-gcc13-clang-repl-17-cppyy
481+
os: ubuntu-24.04
482+
compiler: gcc-13
483483
clang-runtime: '17'
484484
cling: Off
485485
cppyy: On
486-
- name: ubu22-x86-gcc12-clang-repl-16-cppyy
487-
os: ubuntu-22.04
488-
compiler: gcc-12
486+
- name: ubu24-x86-gcc13-clang-repl-16-cppyy
487+
os: ubuntu-24.04
488+
compiler: gcc-13
489489
clang-runtime: '16'
490490
cling: Off
491491
cppyy: On
492-
- name: ubu22-x86-gcc9-clang13-cling-cppyy
493-
os: ubuntu-22.04
494-
compiler: gcc-9
492+
- name: ubu24-x86-gcc13-clang13-cling-cppyy
493+
os: ubuntu-24.04
494+
compiler: gcc-13
495495
clang-runtime: '13'
496496
cling: On
497497
cling-version: '1.0'
@@ -785,7 +785,7 @@ jobs:
785785
- name: Setup code coverage
786786
if: ${{ success() && (matrix.coverage == true) }}
787787
run: |
788-
sudo apt install lcov
788+
sudo apt-get install -y lcov
789789
echo "CODE_COVERAGE=1" >> $GITHUB_ENV
790790
echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
791791
@@ -820,7 +820,6 @@ jobs:
820820
-DBUILD_SHARED_LIBS=ON \
821821
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
822822
-DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR \
823-
-DLLVM_ENABLE_WERROR=On \
824823
../
825824
else
826825
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
@@ -831,7 +830,6 @@ jobs:
831830
-DBUILD_SHARED_LIBS=ON \
832831
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
833832
-DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR \
834-
-DLLVM_ENABLE_WERROR=On \
835833
../
836834
fi
837835
os="${{ matrix.os }}"
@@ -906,7 +904,6 @@ jobs:
906904
-DUSE_REPL=OFF `
907905
-DCling_DIR="$env:LLVM_BUILD_DIR\tools\cling" `
908906
-DLLVM_DIR="$env:LLVM_BUILD_DIR" `
909-
-DLLVM_ENABLE_WERROR=On `
910907
-DClang_DIR="$env:LLVM_BUILD_DIR" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
911908
}
912909
else
@@ -915,7 +912,6 @@ jobs:
915912
-DUSE_CLING=OFF `
916913
-DUSE_REPL=ON `
917914
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
918-
-DLLVM_ENABLE_WERROR=On `
919915
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
920916
}
921917
cmake --build . --config ${{ env.BUILD_TYPE }} --target check-cppinterop --parallel ${{ env.ncpus }}
@@ -966,6 +962,9 @@ jobs:
966962
run: |
967963
python3 -m venv .venv
968964
source .venv/bin/activate
965+
python -m pip install --upgrade pip
966+
pip install setuptools
967+
pip install wheel
969968
# Install CPyCppyy
970969
git clone --depth=1 https://github.com/compiler-research/CPyCppyy.git
971970
mkdir CPyCppyy/build
@@ -985,7 +984,7 @@ jobs:
985984
# Install cppyy
986985
git clone --depth=1 https://github.com/compiler-research/cppyy.git
987986
cd cppyy
988-
python -m pip install --upgrade . --no-deps
987+
python -m pip install --upgrade . --no-deps --no-build-isolation
989988
cd ..
990989
- name: Run cppyy on Unix Systems
991990
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
@@ -1004,7 +1003,6 @@ jobs:
10041003
cd cppyy/test
10051004
echo ::group::Prepare For Testing
10061005
make all
1007-
python -m pip install --upgrade pip
10081006
python -m pip install pytest
10091007
python -m pip install pytest-xdist
10101008
python -m pip install numba
@@ -1076,27 +1074,27 @@ jobs:
10761074
fail-fast: false
10771075
matrix:
10781076
include:
1079-
- name: ubu22-x86-gcc12-clang-repl-18-emscripten_wasm
1080-
os: ubuntu-22.04
1081-
compiler: gcc-12
1077+
- name: ubu24-x86-gcc13-clang-repl-18-emscripten_wasm
1078+
os: ubuntu-24.04
1079+
compiler: gcc-13
10821080
clang-runtime: '18'
10831081
cling: Off
10841082
micromamba_shell_init: bash
1085-
- name: ubu22-x86-gcc12-clang-repl-17-emscripten_wasm
1086-
os: ubuntu-22.04
1087-
compiler: gcc-12
1083+
- name: ubu24-x86-gcc13-clang-repl-17-emscripten_wasm
1084+
os: ubuntu-24.04
1085+
compiler: gcc-13
10881086
clang-runtime: '17'
10891087
cling: Off
10901088
micromamba_shell_init: bash
1091-
- name: ubu22-x86-gcc12-clang-repl-16-emscripten_wasm
1092-
os: ubuntu-22.04
1093-
compiler: gcc-12
1089+
- name: ubu24-x86-gcc13-clang-repl-16-emscripten_wasm
1090+
os: ubuntu-24.04
1091+
compiler: gcc-13
10941092
clang-runtime: '16'
10951093
cling: Off
10961094
micromamba_shell_init: bash
1097-
- name: ubu22-x86-gcc9-clang13-cling-emscripten_wasm
1098-
os: ubuntu-22.04
1099-
compiler: gcc-9
1095+
- name: ubu24-x86-gcc13-clang13-cling-emscripten_wasm
1096+
os: ubuntu-24.04
1097+
compiler: gcc-13
11001098
clang-runtime: '13'
11011099
cling: On
11021100
cling-version: '1.0'

0 commit comments

Comments
 (0)