Skip to content

Commit 0fedf6b

Browse files
aaronj0aaronj0
committed
[ci] Update Linux CI to Ubuntu 24
1 parent 5194327 commit 0fedf6b

File tree

1 file changed

+53
-53
lines changed

1 file changed

+53
-53
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,37 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- name: ubu22-x86-gcc12-clang-repl-19
25-
os: ubuntu-22.04
26-
compiler: gcc-12
24+
- name: ubu24-x86-gcc12-clang-repl-19
25+
os: ubuntu-24.04
26+
compiler: gcc-13
2727
clang-runtime: '19'
2828
cling: Off
2929
cppyy: On
3030
coverage: true
31-
- name: ubu22-x86-gcc12-clang-repl-18
32-
os: ubuntu-22.04
33-
compiler: gcc-12
31+
- name: ubu24-x86-gcc12-clang-repl-18
32+
os: ubuntu-24.04
33+
compiler: gcc-13
3434
clang-runtime: '18'
3535
cling: Off
3636
cppyy: On
3737
coverage: true
38-
- name: ubu22-x86-gcc12-clang-repl-17
39-
os: ubuntu-22.04
40-
compiler: gcc-12
38+
- name: ubu24-x86-gcc13-clang-repl-17
39+
os: ubuntu-24.04
40+
compiler: gcc-13
4141
clang-runtime: '17'
4242
cling: Off
4343
cppyy: On
4444
coverage: true
45-
- name: ubu22-x86-gcc12-clang-repl-16
46-
os: ubuntu-22.04
47-
compiler: gcc-12
45+
- name: ubu24-x86-gcc13-clang-repl-16
46+
os: ubuntu-24.04
47+
compiler: gcc-13
4848
clang-runtime: '16'
4949
cling: Off
5050
cppyy: On
5151
coverage: true
52-
- name: ubu22-x86-gcc9-clang13-cling
53-
os: ubuntu-22.04
54-
compiler: gcc-9
52+
- name: ubu24-x86-gcc13-clang13-cling
53+
os: ubuntu-24.04
54+
compiler: gcc-13
5555
clang-runtime: '13'
5656
cling: On
5757
cling-version: '1.0'
@@ -318,10 +318,12 @@ jobs:
318318
if: ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
319319
run: |
320320
# Install deps
321+
sudo apt remove needrestart
321322
sudo apt-get update
322323
sudo apt-get install valgrind
323324
sudo apt-get autoremove
324325
sudo apt-get clean
326+
325327
326328
- name: Install deps on MacOS
327329
if: ${{ runner.os == 'macOS' && steps.cache.outputs.cache-hit != 'true' }}
@@ -494,35 +496,35 @@ jobs:
494496
fail-fast: false
495497
matrix:
496498
include:
497-
- name: ubu22-x86-gcc12-clang-repl-19-cppyy
498-
os: ubuntu-22.04
499-
compiler: gcc-12
499+
- name: ubu24-x86-gcc13-clang-repl-19-cppyy
500+
os: ubuntu-24.04
501+
compiler: gcc-13
500502
clang-runtime: '19'
501503
cling: Off
502504
cppyy: On
503505
coverage: true
504-
- name: ubu22-x86-gcc12-clang-repl-18-cppyy
505-
os: ubuntu-22.04
506-
compiler: gcc-12
506+
- name: ubu24-x86-gcc12-clang-repl-18-cppyy
507+
os: ubuntu-24.04
508+
compiler: gcc-13
507509
clang-runtime: '18'
508510
cling: Off
509511
cppyy: On
510512
coverage: true
511-
- name: ubu22-x86-gcc12-clang-repl-17-cppyy
512-
os: ubuntu-22.04
513-
compiler: gcc-12
513+
- name: ubu24-x86-gcc13-clang-repl-17-cppyy
514+
os: ubuntu-24.04
515+
compiler: gcc-13
514516
clang-runtime: '17'
515517
cling: Off
516518
cppyy: On
517-
- name: ubu22-x86-gcc12-clang-repl-16-cppyy
518-
os: ubuntu-22.04
519-
compiler: gcc-12
519+
- name: ubu24-x86-gcc13-clang-repl-16-cppyy
520+
os: ubuntu-24.04
521+
compiler: gcc-13
520522
clang-runtime: '16'
521523
cling: Off
522524
cppyy: On
523-
- name: ubu22-x86-gcc9-clang13-cling-cppyy
524-
os: ubuntu-22.04
525-
compiler: gcc-9
525+
- name: ubu24-x86-gcc13-clang13-cling-cppyy
526+
os: ubuntu-24.04
527+
compiler: gcc-13
526528
clang-runtime: '13'
527529
cling: On
528530
cling-version: '1.0'
@@ -793,7 +795,7 @@ jobs:
793795
if: runner.os == 'Linux'
794796
run: |
795797
# Install deps
796-
sudo apt-get update
798+
sudo apt remove needrestart
797799
sudo apt-get install git g++ debhelper devscripts gnupg python3
798800
sudo apt-get install -y libc6-dbg
799801
sudo snap install valgrind --classic
@@ -834,7 +836,7 @@ jobs:
834836
- name: Setup code coverage
835837
if: ${{ success() && (matrix.coverage == true) }}
836838
run: |
837-
sudo apt install lcov
839+
sudo apt-get install -y lcov
838840
echo "CODE_COVERAGE=1" >> $GITHUB_ENV
839841
echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
840842
@@ -869,7 +871,6 @@ jobs:
869871
-DBUILD_SHARED_LIBS=ON \
870872
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
871873
-DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR \
872-
-DLLVM_ENABLE_WERROR=On \
873874
../
874875
else
875876
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
@@ -880,7 +881,6 @@ jobs:
880881
-DBUILD_SHARED_LIBS=ON \
881882
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
882883
-DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR \
883-
-DLLVM_ENABLE_WERROR=On \
884884
../
885885
fi
886886
os="${{ matrix.os }}"
@@ -955,7 +955,6 @@ jobs:
955955
-DUSE_REPL=OFF `
956956
-DCling_DIR="$env:LLVM_BUILD_DIR\tools\cling" `
957957
-DLLVM_DIR="$env:LLVM_BUILD_DIR" `
958-
-DLLVM_ENABLE_WERROR=On `
959958
-DClang_DIR="$env:LLVM_BUILD_DIR" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
960959
}
961960
else
@@ -964,7 +963,6 @@ jobs:
964963
-DUSE_CLING=OFF `
965964
-DUSE_REPL=ON `
966965
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
967-
-DLLVM_ENABLE_WERROR=On `
968966
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
969967
}
970968
cmake --build . --config ${{ env.BUILD_TYPE }} --target check-cppinterop --parallel ${{ env.ncpus }}
@@ -1015,6 +1013,9 @@ jobs:
10151013
run: |
10161014
python3 -m venv .venv
10171015
source .venv/bin/activate
1016+
python -m pip install --upgrade pip
1017+
pip install setuptools
1018+
pip install wheel
10181019
# Install CPyCppyy
10191020
git clone --depth=1 https://github.com/compiler-research/CPyCppyy.git
10201021
mkdir CPyCppyy/build
@@ -1034,7 +1035,7 @@ jobs:
10341035
# Install cppyy
10351036
git clone --depth=1 https://github.com/compiler-research/cppyy.git
10361037
cd cppyy
1037-
python -m pip install --upgrade . --no-deps
1038+
python -m pip install --upgrade . --no-deps --no-build-isolation
10381039
cd ..
10391040
- name: Run cppyy on Unix Systems
10401041
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
@@ -1053,7 +1054,6 @@ jobs:
10531054
cd cppyy/test
10541055
echo ::group::Prepare For Testing
10551056
make all
1056-
python -m pip install --upgrade pip
10571057
python -m pip install pytest
10581058
python -m pip install pytest-xdist
10591059
python -m pip install numba
@@ -1125,33 +1125,33 @@ jobs:
11251125
fail-fast: false
11261126
matrix:
11271127
include:
1128-
- name: ubu22-x86-gcc12-clang-repl-19-emscripten_wasm
1129-
os: ubuntu-22.04
1130-
compiler: gcc-12
1128+
- name: ubu24-x86-gcc13-clang-repl-19-emscripten_wasm
1129+
os: ubuntu-24.04
1130+
compiler: gcc-13
11311131
clang-runtime: '19'
11321132
cling: Off
11331133
micromamba_shell_init: bash
1134-
- name: ubu22-x86-gcc12-clang-repl-18-emscripten_wasm
1135-
os: ubuntu-22.04
1136-
compiler: gcc-12
1134+
- name: ubu24-x86-gcc13-clang-repl-18-emscripten_wasm
1135+
os: ubuntu-24.04
1136+
compiler: gcc-13
11371137
clang-runtime: '18'
11381138
cling: Off
11391139
micromamba_shell_init: bash
1140-
- name: ubu22-x86-gcc12-clang-repl-17-emscripten_wasm
1141-
os: ubuntu-22.04
1142-
compiler: gcc-12
1140+
- name: ubu24-x86-gcc13-clang-repl-17-emscripten_wasm
1141+
os: ubuntu-24.04
1142+
compiler: gcc-13
11431143
clang-runtime: '17'
11441144
cling: Off
11451145
micromamba_shell_init: bash
1146-
- name: ubu22-x86-gcc12-clang-repl-16-emscripten_wasm
1147-
os: ubuntu-22.04
1148-
compiler: gcc-12
1146+
- name: ubu24-x86-gcc13-clang-repl-16-emscripten_wasm
1147+
os: ubuntu-24.04
1148+
compiler: gcc-13
11491149
clang-runtime: '16'
11501150
cling: Off
11511151
micromamba_shell_init: bash
1152-
- name: ubu22-x86-gcc9-clang13-cling-emscripten_wasm
1153-
os: ubuntu-22.04
1154-
compiler: gcc-9
1152+
- name: ubu24-x86-gcc13-clang13-cling-emscripten_wasm
1153+
os: ubuntu-24.04
1154+
compiler: gcc-13
11551155
clang-runtime: '13'
11561156
cling: On
11571157
cling-version: '1.0'

0 commit comments

Comments
 (0)