Skip to content

Commit 6c37255

Browse files
Update to Ubuntu 24.04 in GitHub actions builds.
1 parent 2af0566 commit 6c37255

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

.github/workflows/CI.yml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010

1111
jobs:
1212
linux-gcc:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
continue-on-error: true
1515
strategy:
1616
matrix:
@@ -22,8 +22,6 @@ jobs:
2222
CXX: g++-${{ matrix.gcc_version }}
2323
steps:
2424
- uses: actions/checkout@v4
25-
- if: ${{ matrix.gcc_version == '13' }}
26-
run: sudo apt-add-repository 'ppa:ubuntu-toolchain-r/test' && break || sleep 1
2725
- name: install compiler
2826
run: sudo apt-get install gcc-${{ matrix.gcc_version }} g++-${{ matrix.gcc_version }}
2927
- if: ${{ matrix.topology != 'no' }}
@@ -41,20 +39,14 @@ jobs:
4139
timeout-minutes: 4
4240

4341
linux-clang:
44-
runs-on: ubuntu-22.04
42+
runs-on: ubuntu-24.04
4543
continue-on-error: true
4644
strategy:
4745
matrix:
48-
clang_version: [11, 12, 13, 14, 15, 16, 17, 18]
46+
clang_version: [14, 15, 16, 17, 18]
4947
scheduler: [nemesis, sherwood, distrib]
5048
topology: [hwloc, binders, no]
5149
include:
52-
- clang_version: 11
53-
gcc_version: 10
54-
- clang_version: 12
55-
gcc_version: 11
56-
- clang_version: 13
57-
gcc_version: 11
5850
- clang_version: 14
5951
gcc_version: 11
6052
- clang_version: 15
@@ -70,12 +62,6 @@ jobs:
7062
CXX: clang++-${{ matrix.clang_version }}
7163
steps:
7264
- uses: actions/checkout@v4
73-
- if: ${{ matrix.clang_version == '16' || matrix.clang_version == '17' || matrix.clang_version == '18' }}
74-
run: |
75-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && break || sleep 1
76-
sudo apt-add-repository 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-${{ matrix.clang_version }} main' && break || sleep 1
77-
- if: ${{ matrix.gcc_version == '13' }}
78-
run: sudo apt-add-repository 'ppa:ubuntu-toolchain-r/test' && break || sleep 1
7965
- name: install gcc
8066
run: sudo apt-get install gcc-${{ matrix.gcc_version }} g++-${{ matrix.gcc_version }}
8167
- name: install clang
@@ -95,7 +81,7 @@ jobs:
9581
timeout-minutes: 7
9682

9783
linux-icx:
98-
runs-on: ubuntu-22.04
84+
runs-on: ubuntu-24.04
9985
continue-on-error: true
10086
strategy:
10187
matrix:
@@ -112,7 +98,6 @@ jobs:
11298
hwloc-ls --version
11399
- name: install gcc
114100
run: |
115-
sudo apt-add-repository 'ppa:ubuntu-toolchain-r/test' && break || sleep 1
116101
sudo apt-get install gcc-13 g++-13
117102
- name: install icx
118103
run: |
@@ -176,7 +161,7 @@ jobs:
176161
timeout-minutes: 7
177162

178163
linux-aocc:
179-
runs-on: ubuntu-22.04
164+
runs-on: ubuntu-24.04
180165
continue-on-error: true
181166
strategy:
182167
matrix:
@@ -193,7 +178,6 @@ jobs:
193178
hwloc-ls --version
194179
- name: install gcc
195180
run: |
196-
sudo apt-add-repository 'ppa:ubuntu-toolchain-r/test' && break || sleep 1
197181
sudo apt-get install gcc-13 g++-13
198182
- name: install aocc
199183
run: |
@@ -268,7 +252,6 @@ jobs:
268252
- uses: actions/checkout@v4
269253
- if: ${{ ! matrix.use_libcxx }}
270254
run: |
271-
sudo apt-add-repository universe && break || sleep 1
272255
sudo apt-get install gcc-14 g++-14
273256
- name: install compiler
274257
run: |
@@ -312,7 +295,6 @@ jobs:
312295
steps:
313296
- uses: actions/checkout@v4
314297
- run: |
315-
sudo apt-add-repository universe && break || sleep 1
316298
sudo apt-get install gcc-14 g++-14
317299
- if: ${{ matrix.compiler == 'clang' }}
318300
run: |
@@ -344,7 +326,6 @@ jobs:
344326
steps:
345327
- uses: actions/checkout@v4
346328
- run: |
347-
sudo apt-add-repository universe && break || sleep 1
348329
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && break || sleep 1
349330
sudo apt-add-repository 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' && break || sleep 1
350331
sudo apt-get install clang-format-19

0 commit comments

Comments
 (0)