Skip to content

Commit 13f430c

Browse files
aaronj0mcbarton
authored andcommitted
[ci] Update Linux CI to Ubuntu 24
1 parent c0a4dfe commit 13f430c

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'
@@ -305,6 +305,7 @@ jobs:
305305
if: ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
306306
run: |
307307
# Install deps
308+
sudo apt remove needrestart
308309
sudo apt-get update
309310
sudo apt-get install valgrind
310311
sudo apt-get autoremove
@@ -481,35 +482,35 @@ jobs:
481482
fail-fast: false
482483
matrix:
483484
include:
484-
- name: ubu22-x86-gcc12-clang-repl-19-cppyy
485-
os: ubuntu-22.04
486-
compiler: gcc-12
485+
- name: ubu24-x86-gcc13-clang-repl-19-cppyy
486+
os: ubuntu-24.04
487+
compiler: gcc-13
487488
clang-runtime: '19'
488489
cling: Off
489490
cppyy: On
490491
coverage: true
491-
- name: ubu22-x86-gcc12-clang-repl-18-cppyy
492-
os: ubuntu-22.04
493-
compiler: gcc-12
492+
- name: ubu24-x86-gcc12-clang-repl-18-cppyy
493+
os: ubuntu-24.04
494+
compiler: gcc-13
494495
clang-runtime: '18'
495496
cling: Off
496497
cppyy: On
497498
coverage: true
498-
- name: ubu22-x86-gcc12-clang-repl-17-cppyy
499-
os: ubuntu-22.04
500-
compiler: gcc-12
499+
- name: ubu24-x86-gcc13-clang-repl-17-cppyy
500+
os: ubuntu-24.04
501+
compiler: gcc-13
501502
clang-runtime: '17'
502503
cling: Off
503504
cppyy: On
504-
- name: ubu22-x86-gcc12-clang-repl-16-cppyy
505-
os: ubuntu-22.04
506-
compiler: gcc-12
505+
- name: ubu24-x86-gcc13-clang-repl-16-cppyy
506+
os: ubuntu-24.04
507+
compiler: gcc-13
507508
clang-runtime: '16'
508509
cling: Off
509510
cppyy: On
510-
- name: ubu22-x86-gcc9-clang13-cling-cppyy
511-
os: ubuntu-22.04
512-
compiler: gcc-9
511+
- name: ubu24-x86-gcc13-clang13-cling-cppyy
512+
os: ubuntu-24.04
513+
compiler: gcc-13
513514
clang-runtime: '13'
514515
cling: On
515516
cling-version: '1.0'
@@ -754,7 +755,7 @@ jobs:
754755
if: runner.os == 'Linux'
755756
run: |
756757
# Install deps
757-
sudo apt-get update
758+
sudo apt remove needrestart
758759
sudo apt-get install git g++ debhelper devscripts gnupg python3
759760
sudo apt-get install -y libc6-dbg
760761
sudo snap install valgrind --classic
@@ -796,7 +797,7 @@ jobs:
796797
- name: Setup code coverage
797798
if: ${{ success() && (matrix.coverage == true) }}
798799
run: |
799-
sudo apt install lcov
800+
sudo apt-get install -y lcov
800801
echo "CODE_COVERAGE=1" >> $GITHUB_ENV
801802
echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
802803
@@ -977,6 +978,9 @@ jobs:
977978
run: |
978979
python3 -m venv .venv
979980
source .venv/bin/activate
981+
python -m pip install --upgrade pip
982+
pip install setuptools
983+
pip install wheel
980984
# Install CPyCppyy
981985
git clone --depth=1 https://github.com/compiler-research/CPyCppyy.git
982986
mkdir CPyCppyy/build
@@ -996,7 +1000,7 @@ jobs:
9961000
# Install cppyy
9971001
git clone --depth=1 https://github.com/compiler-research/cppyy.git
9981002
cd cppyy
999-
python -m pip install --upgrade . --no-deps
1003+
python -m pip install --upgrade . --no-deps --no-build-isolation
10001004
cd ..
10011005
- name: Run cppyy on Unix Systems
10021006
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
@@ -1015,7 +1019,6 @@ jobs:
10151019
cd cppyy/test
10161020
echo ::group::Prepare For Testing
10171021
make all
1018-
python -m pip install --upgrade pip
10191022
python -m pip install pytest
10201023
python -m pip install pytest-xdist
10211024
python -m pip install numba
@@ -1087,33 +1090,33 @@ jobs:
10871090
fail-fast: false
10881091
matrix:
10891092
include:
1090-
- name: ubu22-x86-gcc12-clang-repl-19-emscripten_wasm
1091-
os: ubuntu-22.04
1092-
compiler: gcc-12
1093+
- name: ubu24-x86-gcc13-clang-repl-19-emscripten_wasm
1094+
os: ubuntu-24.04
1095+
compiler: gcc-13
10931096
clang-runtime: '19'
10941097
cling: Off
10951098
micromamba_shell_init: bash
1096-
- name: ubu22-x86-gcc12-clang-repl-18-emscripten_wasm
1097-
os: ubuntu-22.04
1098-
compiler: gcc-12
1099+
- name: ubu24-x86-gcc13-clang-repl-18-emscripten_wasm
1100+
os: ubuntu-24.04
1101+
compiler: gcc-13
10991102
clang-runtime: '18'
11001103
cling: Off
11011104
micromamba_shell_init: bash
1102-
- name: ubu22-x86-gcc12-clang-repl-17-emscripten_wasm
1103-
os: ubuntu-22.04
1104-
compiler: gcc-12
1105+
- name: ubu24-x86-gcc13-clang-repl-17-emscripten_wasm
1106+
os: ubuntu-24.04
1107+
compiler: gcc-13
11051108
clang-runtime: '17'
11061109
cling: Off
11071110
micromamba_shell_init: bash
1108-
- name: ubu22-x86-gcc12-clang-repl-16-emscripten_wasm
1109-
os: ubuntu-22.04
1110-
compiler: gcc-12
1111+
- name: ubu24-x86-gcc13-clang-repl-16-emscripten_wasm
1112+
os: ubuntu-24.04
1113+
compiler: gcc-13
11111114
clang-runtime: '16'
11121115
cling: Off
11131116
micromamba_shell_init: bash
1114-
- name: ubu22-x86-gcc9-clang13-cling-emscripten_wasm
1115-
os: ubuntu-22.04
1116-
compiler: gcc-9
1117+
- name: ubu24-x86-gcc13-clang13-cling-emscripten_wasm
1118+
os: ubuntu-24.04
1119+
compiler: gcc-13
11171120
clang-runtime: '13'
11181121
cling: On
11191122
cling-version: '1.0'

0 commit comments

Comments
 (0)