Skip to content

Commit 185a100

Browse files
committed
[ci] Update Linux CI to Ubuntu 24
1 parent b2d787b commit 185a100

File tree

1 file changed

+50
-46
lines changed

1 file changed

+50
-46
lines changed

.github/workflows/ci.yml

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,33 @@ 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-gcc13-clang-repl-19
25+
os: ubuntu-24.04
26+
compiler: gcc-13
2727
clang-runtime: '19'
2828
cling: Off
2929
cppyy: On
30-
- name: ubu22-x86-gcc12-clang-repl-18
31-
os: ubuntu-22.04
32-
compiler: gcc-12
30+
- name: ubu24-x86-gcc13-clang-repl-18
31+
os: ubuntu-24.04
32+
compiler: gcc-13
3333
clang-runtime: '18'
3434
cling: Off
3535
cppyy: On
36-
- name: ubu22-x86-gcc12-clang-repl-17
37-
os: ubuntu-22.04
38-
compiler: gcc-12
36+
- name: ubu24-x86-gcc13-clang-repl-17
37+
os: ubuntu-24.04
38+
compiler: gcc-13
3939
clang-runtime: '17'
4040
cling: Off
4141
cppyy: On
42-
- name: ubu22-x86-gcc12-clang-repl-16
43-
os: ubuntu-22.04
44-
compiler: gcc-12
42+
- name: ubu24-x86-gcc13-clang-repl-16
43+
os: ubuntu-24.04
44+
compiler: gcc-13
4545
clang-runtime: '16'
4646
cling: Off
4747
cppyy: On
48-
- name: ubu22-x86-gcc9-clang13-cling
49-
os: ubuntu-22.04
50-
compiler: gcc-9
48+
- name: ubu24-x86-gcc13-clang13-cling
49+
os: ubuntu-24.04
50+
compiler: gcc-13
5151
clang-runtime: '13'
5252
cling: On
5353
cling-version: '1.0'
@@ -300,6 +300,7 @@ jobs:
300300
if: ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
301301
run: |
302302
# Install deps
303+
sudo apt remove needrestart
303304
sudo apt-get update
304305
sudo apt-get install valgrind
305306
sudo apt-get autoremove
@@ -476,34 +477,34 @@ jobs:
476477
fail-fast: false
477478
matrix:
478479
include:
479-
- name: ubu22-x86-gcc12-clang-repl-19-cppyy
480-
os: ubuntu-22.04
481-
compiler: gcc-12
480+
- name: ubu24-x86-gcc13-clang-repl-19-cppyy
481+
os: ubuntu-24.04
482+
compiler: gcc-13
482483
clang-runtime: '19'
483484
cling: Off
484485
cppyy: On
485486
coverage: true
486-
- name: ubu22-x86-gcc12-clang-repl-18-cppyy
487-
os: ubuntu-22.04
488-
compiler: gcc-12
487+
- name: ubu24-x86-gcc13-clang-repl-18-cppyy
488+
os: ubuntu-24.04
489+
compiler: gcc-13
489490
clang-runtime: '18'
490491
cling: Off
491492
cppyy: On
492-
- name: ubu22-x86-gcc12-clang-repl-17-cppyy
493-
os: ubuntu-22.04
494-
compiler: gcc-12
493+
- name: ubu24-x86-gcc13-clang-repl-17-cppyy
494+
os: ubuntu-24.04
495+
compiler: gcc-13
495496
clang-runtime: '17'
496497
cling: Off
497498
cppyy: On
498-
- name: ubu22-x86-gcc12-clang-repl-16-cppyy
499-
os: ubuntu-22.04
500-
compiler: gcc-12
499+
- name: ubu24-x86-gcc13-clang-repl-16-cppyy
500+
os: ubuntu-24.04
501+
compiler: gcc-13
501502
clang-runtime: '16'
502503
cling: Off
503504
cppyy: On
504-
- name: ubu22-x86-gcc9-clang13-cling-cppyy
505-
os: ubuntu-22.04
506-
compiler: gcc-9
505+
- name: ubu24-x86-gcc13-clang13-cling-cppyy
506+
os: ubuntu-24.04
507+
compiler: gcc-13
507508
clang-runtime: '13'
508509
cling: On
509510
cling-version: '1.0'
@@ -748,6 +749,7 @@ jobs:
748749
if: runner.os == 'Linux'
749750
run: |
750751
# Install deps
752+
sudo apt remove needrestart
751753
sudo apt-get update
752754
sudo apt-get install git g++ debhelper devscripts gnupg python3
753755
sudo apt-get install -y libc6-dbg
@@ -971,6 +973,9 @@ jobs:
971973
run: |
972974
python3 -m venv .venv
973975
source .venv/bin/activate
976+
python -m pip install --upgrade pip
977+
pip install setuptools
978+
pip install wheel
974979
# Install CPyCppyy
975980
git clone --depth=1 https://github.com/compiler-research/CPyCppyy.git
976981
mkdir CPyCppyy/build
@@ -1009,7 +1014,6 @@ jobs:
10091014
cd cppyy/test
10101015
echo ::group::Prepare For Testing
10111016
make all
1012-
python -m pip install --upgrade pip
10131017
python -m pip install pytest
10141018
python -m pip install pytest-xdist
10151019
python -m pip install numba
@@ -1081,33 +1085,33 @@ jobs:
10811085
fail-fast: false
10821086
matrix:
10831087
include:
1084-
- name: ubu22-x86-gcc12-clang-repl-19-emscripten_wasm
1085-
os: ubuntu-22.04
1086-
compiler: gcc-12
1088+
- name: ubu24-x86-gcc13-clang-repl-19-emscripten_wasm
1089+
os: ubuntu-24.04
1090+
compiler: gcc-13
10871091
clang-runtime: '19'
10881092
cling: Off
10891093
micromamba_shell_init: bash
1090-
- name: ubu22-x86-gcc12-clang-repl-18-emscripten_wasm
1091-
os: ubuntu-22.04
1092-
compiler: gcc-12
1094+
- name: ubu24-x86-gcc13-clang-repl-18-emscripten_wasm
1095+
os: ubuntu-24.04
1096+
compiler: gcc-13
10931097
clang-runtime: '18'
10941098
cling: Off
10951099
micromamba_shell_init: bash
1096-
- name: ubu22-x86-gcc12-clang-repl-17-emscripten_wasm
1097-
os: ubuntu-22.04
1098-
compiler: gcc-12
1100+
- name: ubu24-x86-gcc13-clang-repl-17-emscripten_wasm
1101+
os: ubuntu-24.04
1102+
compiler: gcc-13
10991103
clang-runtime: '17'
11001104
cling: Off
11011105
micromamba_shell_init: bash
1102-
- name: ubu22-x86-gcc12-clang-repl-16-emscripten_wasm
1103-
os: ubuntu-22.04
1104-
compiler: gcc-12
1106+
- name: ubu24-x86-gcc13-clang-repl-16-emscripten_wasm
1107+
os: ubuntu-24.04
1108+
compiler: gcc-13
11051109
clang-runtime: '16'
11061110
cling: Off
11071111
micromamba_shell_init: bash
1108-
- name: ubu22-x86-gcc9-clang13-cling-emscripten_wasm
1109-
os: ubuntu-22.04
1110-
compiler: gcc-9
1112+
- name: ubu24-x86-gcc13-clang13-cling-emscripten_wasm
1113+
os: ubuntu-24.04
1114+
compiler: gcc-13
11111115
clang-runtime: '13'
11121116
cling: On
11131117
cling-version: '1.0'

0 commit comments

Comments
 (0)