Skip to content

Commit 40a2528

Browse files
committed
[ci] Update Linux CI to Ubuntu 24
1 parent 5194327 commit 40a2528

File tree

1 file changed

+52
-49
lines changed

1 file changed

+52
-49
lines changed

.github/workflows/ci.yml

Lines changed: 52 additions & 49 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,6 +318,7 @@ 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
@@ -494,35 +495,35 @@ jobs:
494495
fail-fast: false
495496
matrix:
496497
include:
497-
- name: ubu22-x86-gcc12-clang-repl-19-cppyy
498-
os: ubuntu-22.04
499-
compiler: gcc-12
498+
- name: ubu24-x86-gcc13-clang-repl-19-cppyy
499+
os: ubuntu-24.04
500+
compiler: gcc-13
500501
clang-runtime: '19'
501502
cling: Off
502503
cppyy: On
503504
coverage: true
504-
- name: ubu22-x86-gcc12-clang-repl-18-cppyy
505-
os: ubuntu-22.04
506-
compiler: gcc-12
505+
- name: ubu24-x86-gcc12-clang-repl-18-cppyy
506+
os: ubuntu-24.04
507+
compiler: gcc-13
507508
clang-runtime: '18'
508509
cling: Off
509510
cppyy: On
510511
coverage: true
511-
- name: ubu22-x86-gcc12-clang-repl-17-cppyy
512-
os: ubuntu-22.04
513-
compiler: gcc-12
512+
- name: ubu24-x86-gcc13-clang-repl-17-cppyy
513+
os: ubuntu-24.04
514+
compiler: gcc-13
514515
clang-runtime: '17'
515516
cling: Off
516517
cppyy: On
517-
- name: ubu22-x86-gcc12-clang-repl-16-cppyy
518-
os: ubuntu-22.04
519-
compiler: gcc-12
518+
- name: ubu24-x86-gcc13-clang-repl-16-cppyy
519+
os: ubuntu-24.04
520+
compiler: gcc-13
520521
clang-runtime: '16'
521522
cling: Off
522523
cppyy: On
523-
- name: ubu22-x86-gcc9-clang13-cling-cppyy
524-
os: ubuntu-22.04
525-
compiler: gcc-9
524+
- name: ubu24-x86-gcc13-clang13-cling-cppyy
525+
os: ubuntu-24.04
526+
compiler: gcc-13
526527
clang-runtime: '13'
527528
cling: On
528529
cling-version: '1.0'
@@ -793,7 +794,7 @@ jobs:
793794
if: runner.os == 'Linux'
794795
run: |
795796
# Install deps
796-
sudo apt-get update
797+
sudo apt remove needrestart
797798
sudo apt-get install git g++ debhelper devscripts gnupg python3
798799
sudo apt-get install -y libc6-dbg
799800
sudo snap install valgrind --classic
@@ -834,7 +835,7 @@ jobs:
834835
- name: Setup code coverage
835836
if: ${{ success() && (matrix.coverage == true) }}
836837
run: |
837-
sudo apt install lcov
838+
sudo apt-get install -y lcov
838839
echo "CODE_COVERAGE=1" >> $GITHUB_ENV
839840
echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
840841
@@ -1015,6 +1016,9 @@ jobs:
10151016
run: |
10161017
python3 -m venv .venv
10171018
source .venv/bin/activate
1019+
python -m pip install --upgrade pip
1020+
pip install setuptools
1021+
pip install wheel
10181022
# Install CPyCppyy
10191023
git clone --depth=1 https://github.com/compiler-research/CPyCppyy.git
10201024
mkdir CPyCppyy/build
@@ -1034,7 +1038,7 @@ jobs:
10341038
# Install cppyy
10351039
git clone --depth=1 https://github.com/compiler-research/cppyy.git
10361040
cd cppyy
1037-
python -m pip install --upgrade . --no-deps
1041+
python -m pip install --upgrade . --no-deps --no-build-isolation
10381042
cd ..
10391043
- name: Run cppyy on Unix Systems
10401044
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
@@ -1053,7 +1057,6 @@ jobs:
10531057
cd cppyy/test
10541058
echo ::group::Prepare For Testing
10551059
make all
1056-
python -m pip install --upgrade pip
10571060
python -m pip install pytest
10581061
python -m pip install pytest-xdist
10591062
python -m pip install numba
@@ -1125,33 +1128,33 @@ jobs:
11251128
fail-fast: false
11261129
matrix:
11271130
include:
1128-
- name: ubu22-x86-gcc12-clang-repl-19-emscripten_wasm
1129-
os: ubuntu-22.04
1130-
compiler: gcc-12
1131+
- name: ubu24-x86-gcc13-clang-repl-19-emscripten_wasm
1132+
os: ubuntu-24.04
1133+
compiler: gcc-13
11311134
clang-runtime: '19'
11321135
cling: Off
11331136
micromamba_shell_init: bash
1134-
- name: ubu22-x86-gcc12-clang-repl-18-emscripten_wasm
1135-
os: ubuntu-22.04
1136-
compiler: gcc-12
1137+
- name: ubu24-x86-gcc13-clang-repl-18-emscripten_wasm
1138+
os: ubuntu-24.04
1139+
compiler: gcc-13
11371140
clang-runtime: '18'
11381141
cling: Off
11391142
micromamba_shell_init: bash
1140-
- name: ubu22-x86-gcc12-clang-repl-17-emscripten_wasm
1141-
os: ubuntu-22.04
1142-
compiler: gcc-12
1143+
- name: ubu24-x86-gcc13-clang-repl-17-emscripten_wasm
1144+
os: ubuntu-24.04
1145+
compiler: gcc-13
11431146
clang-runtime: '17'
11441147
cling: Off
11451148
micromamba_shell_init: bash
1146-
- name: ubu22-x86-gcc12-clang-repl-16-emscripten_wasm
1147-
os: ubuntu-22.04
1148-
compiler: gcc-12
1149+
- name: ubu24-x86-gcc13-clang-repl-16-emscripten_wasm
1150+
os: ubuntu-24.04
1151+
compiler: gcc-13
11491152
clang-runtime: '16'
11501153
cling: Off
11511154
micromamba_shell_init: bash
1152-
- name: ubu22-x86-gcc9-clang13-cling-emscripten_wasm
1153-
os: ubuntu-22.04
1154-
compiler: gcc-9
1155+
- name: ubu24-x86-gcc13-clang13-cling-emscripten_wasm
1156+
os: ubuntu-24.04
1157+
compiler: gcc-13
11551158
clang-runtime: '13'
11561159
cling: On
11571160
cling-version: '1.0'

0 commit comments

Comments
 (0)