Skip to content

Commit 76e475f

Browse files
committed
ci: use gcc 15 for msys
1 parent c0beefd commit 76e475f

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,8 @@ jobs:
135135
uses: Totto16/msys2-install-packages-pinned@v1
136136
with:
137137
msystem: ${{matrix.config.environment == 'mingw' && 'MINGW64' || 'UCRT64'}}
138-
# gcc-libs 14 don't provbide the virtual package cc-libs, only gcc-libs 15 (see https://github.com/msys2/MINGW-packages/commit/9fa882f7eb6f639780a13df016497a93e45544ac) provide it, so until we use gcc 15, nghttp3 < 1.10.1 needs to be used (see https://github.com/msys2/MINGW-packages/commit/16b7f94772f29f1c207764701d863d266a5de64c) since 1.10.1 needs cc-libs and not gcc-libs. The newest version matching that constraint is 1.9.0
139-
# for the other pavckages see https://github.com/msys2/MINGW-packages/commit/62308009e77d772a126313626b194e503b0e5135
140138
install: |
141-
nghttp3=1.9
142-
SDL2=2.32.8
143-
aom=3.12.0
144-
curl=8.13.0
145-
gnutls=3.8.8
146-
libarchive=3.7.9
147-
mpg123=1.32.9
148-
ngtcp2=1.12.0
149-
python=3.12.9-4
150-
gcc=14 gcc-libs=!
139+
gcc=15 gcc-libs=!
151140
152141
- name: Setup Clang (Linux) (libc++)
153142
if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib

tools/options/meson.build

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ if get_option('run_in_ci')
5151
'checks': ['>=14', '<15'],
5252
}
5353

54+
gcc_15_compiler = {
55+
'id': 'gcc',
56+
'checks': ['>=15', '<16'],
57+
}
58+
5459
msvc_compiler_current = {
5560
'id': 'msvc',
5661
'checks': ['>=19.43', '<20'],
@@ -78,7 +83,7 @@ if get_option('run_in_ci')
7883
'compilers': [msvc_compiler_current],
7984
},
8085
'msys2': {
81-
'compilers': [gcc_14_compiler],
86+
'compilers': [gcc_15_compiler],
8287
},
8388
'linux': {
8489
'compilers': [clang_20_compiler, gcc_14_compiler],

0 commit comments

Comments
 (0)