Skip to content

Commit 0ed845d

Browse files
Fix CI
1 parent 9ecb111 commit 0ed845d

File tree

1 file changed

+32
-66
lines changed

1 file changed

+32
-66
lines changed

.github/workflows/ci.yml

Lines changed: 32 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,6 @@ env:
1818
TEST_REF_FORBID_GEN_REFS: true
1919

2020
jobs:
21-
tests-ubuntu2004-gpp:
22-
strategy:
23-
matrix:
24-
os: [ubuntu-20.04]
25-
compiler: [g++]
26-
version: [9, 10]
27-
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
28-
runs-on: ${{ matrix.os }}
29-
steps:
30-
- uses: actions/checkout@v3
31-
- name: Run tests
32-
run: |
33-
cd tests
34-
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
35-
36-
tests-ubuntu2004-clang:
37-
strategy:
38-
matrix:
39-
os: [ubuntu-20.04]
40-
compiler: [clang++]
41-
version: [10, 11, 12]
42-
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
43-
runs-on: ${{ matrix.os }}
44-
steps:
45-
- uses: actions/checkout@v3
46-
- name: Run tests
47-
run: |
48-
cd tests
49-
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
50-
5121
tests-ubuntu2204-gpp:
5222
strategy:
5323
matrix:
@@ -78,12 +48,12 @@ jobs:
7848
cd tests
7949
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
8050
81-
tests-ubuntu2004-gpp-32:
51+
tests-ubuntu2204-gpp-32:
8252
strategy:
8353
matrix:
84-
os: [ubuntu-20.04]
54+
os: [ubuntu-22.04]
8555
compiler: [g++]
86-
version: [9, 10]
56+
version: [9, 10, 11]
8757
name: Use ${{ matrix.compiler }}-${{ matrix.version }} -m32 on ${{ matrix.os }}
8858
runs-on: ${{ matrix.os }}
8959
steps:
@@ -95,12 +65,12 @@ jobs:
9565
cd tests
9666
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }} 32
9767
98-
tests-ubuntu2004-clang-32:
68+
tests-ubuntu2204-clang-32:
9969
strategy:
10070
matrix:
101-
os: [ubuntu-20.04]
71+
os: [ubuntu-22.04]
10272
compiler: [clang++]
103-
version: [10, 11, 12]
73+
version: [13, 14]
10474
name: Use ${{ matrix.compiler }}-${{ matrix.version }} -m32 on ${{ matrix.os }}
10575
runs-on: ${{ matrix.os }}
10676
steps:
@@ -112,44 +82,40 @@ jobs:
11282
cd tests
11383
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }} 32
11484
115-
tests-ubuntu2204-gpp-32:
85+
tests-ubuntu2404-gpp:
11686
strategy:
11787
matrix:
118-
os: [ubuntu-22.04]
88+
os: [ubuntu-24.04]
11989
compiler: [g++]
120-
version: [9, 10, 11]
121-
name: Use ${{ matrix.compiler }}-${{ matrix.version }} -m32 on ${{ matrix.os }}
90+
version: [13]
91+
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
12292
runs-on: ${{ matrix.os }}
12393
steps:
12494
- uses: actions/checkout@v3
12595
- name: Run tests
12696
run: |
127-
sudo apt-get update
128-
sudo apt-get install gcc-${{ matrix.version }}-multilib g++-${{ matrix.version }}-multilib
12997
cd tests
130-
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }} 32
98+
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
13199
132-
tests-ubuntu2204-clang-32:
100+
tests-ubuntu2404-clang:
133101
strategy:
134102
matrix:
135-
os: [ubuntu-22.04]
103+
os: [ubuntu-24.04]
136104
compiler: [clang++]
137-
version: [13, 14]
138-
name: Use ${{ matrix.compiler }}-${{ matrix.version }} -m32 on ${{ matrix.os }}
105+
version: [16]
106+
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
139107
runs-on: ${{ matrix.os }}
140108
steps:
141109
- uses: actions/checkout@v3
142110
- name: Run tests
143111
run: |
144-
sudo apt-get update
145-
sudo apt-get install gcc-multilib g++-multilib
146112
cd tests
147-
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }} 32
113+
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
148114
149-
tests-macos12-gpp:
115+
tests-macos13-gpp:
150116
strategy:
151117
matrix:
152-
os: [macos-12]
118+
os: [macos-13]
153119
compiler: [g++]
154120
version: [12, 13, 14]
155121
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
@@ -161,10 +127,10 @@ jobs:
161127
cd tests
162128
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
163129
164-
tests-macos12-clang:
130+
tests-macos13-clang:
165131
strategy:
166132
matrix:
167-
os: [macos-12]
133+
os: [macos-13]
168134
compiler: [clang++]
169135
name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
170136
runs-on: ${{ matrix.os }}
@@ -175,10 +141,10 @@ jobs:
175141
cd tests
176142
bash ./run.sh ${{ matrix.compiler }}
177143
178-
tests-macos13-gpp:
144+
tests-macos14-gpp:
179145
strategy:
180146
matrix:
181-
os: [macos-13]
147+
os: [macos-14]
182148
compiler: [g++]
183149
version: [12, 13, 14]
184150
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
@@ -190,10 +156,10 @@ jobs:
190156
cd tests
191157
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
192158
193-
tests-macos13-clang:
159+
tests-macos14-clang:
194160
strategy:
195161
matrix:
196-
os: [macos-13]
162+
os: [macos-14]
197163
compiler: [clang++]
198164
name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
199165
runs-on: ${{ matrix.os }}
@@ -204,10 +170,10 @@ jobs:
204170
cd tests
205171
bash ./run.sh ${{ matrix.compiler }}
206172
207-
tests-macos14-gpp:
173+
tests-macos15-gpp:
208174
strategy:
209175
matrix:
210-
os: [macos-14]
176+
os: [macos-15]
211177
compiler: [g++]
212178
version: [12, 13, 14]
213179
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
@@ -219,10 +185,10 @@ jobs:
219185
cd tests
220186
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
221187
222-
tests-macos14-clang:
188+
tests-macos15-clang:
223189
strategy:
224190
matrix:
225-
os: [macos-14]
191+
os: [macos-15]
226192
compiler: [clang++]
227193
name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
228194
runs-on: ${{ matrix.os }}
@@ -233,10 +199,10 @@ jobs:
233199
cd tests
234200
bash ./run.sh ${{ matrix.compiler }}
235201
236-
tests-windows-2019:
202+
tests-windows-2022:
237203
strategy:
238204
matrix:
239-
os: [windows-2019]
205+
os: [windows-2022]
240206
compiler: [msvc, g++, clang++]
241207
name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
242208
runs-on: ${{ matrix.os }}
@@ -247,10 +213,10 @@ jobs:
247213
cd tests
248214
bash ./run.sh ${{ matrix.compiler }}
249215
250-
tests-windows-2022:
216+
tests-windows-2025:
251217
strategy:
252218
matrix:
253-
os: [windows-2022]
219+
os: [windows-2025]
254220
compiler: [msvc, g++, clang++]
255221
name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
256222
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)