diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99838c8c..7d680695 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,10 +135,7 @@ jobs: uses: Totto16/msys2-install-packages-pinned@v1 with: msystem: ${{matrix.config.environment == 'mingw' && 'MINGW64' || 'UCRT64'}} - # 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 - install: | - nghttp3=1.9 - gcc=14 gcc-libs=! + install: gcc=15 gcc-libs=! - name: Setup Clang (Linux) (libc++) if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib @@ -165,7 +162,7 @@ jobs: if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == false uses: egor-tensin/setup-gcc@v1 with: - version: 14 + version: 15 platform: x64 - name: Unbreak Python in GHA (MacOS 13 image) diff --git a/.github/workflows/nintendo.yml b/.github/workflows/nintendo.yml index da1f5de5..ba834873 100644 --- a/.github/workflows/nintendo.yml +++ b/.github/workflows/nintendo.yml @@ -19,12 +19,12 @@ jobs: - name: 3ds extension: 3dsx container: devkitarm - revision: "20250102" + revision: "latest" - name: switch extension: nro container: devkita64 - revision: "20241023" + revision: "latest" steps: - uses: actions/checkout@v4 diff --git a/tools/options/meson.build b/tools/options/meson.build index b8a580aa..53c3c414 100644 --- a/tools/options/meson.build +++ b/tools/options/meson.build @@ -46,9 +46,9 @@ if get_option('run_in_ci') 'checks': ['>=20', '<21'], } - gcc_14_compiler = { + gcc_15_compiler = { 'id': 'gcc', - 'checks': ['>=14', '<15'], + 'checks': ['>=15', '<16'], } msvc_compiler_current = { @@ -66,10 +66,10 @@ if get_option('run_in_ci') 'compilers': [clang_20_compiler], }, 'cross_3ds': { - 'compilers': [gcc_14_compiler], + 'compilers': [gcc_15_compiler], }, 'cross_switch': { - 'compilers': [gcc_14_compiler], + 'compilers': [gcc_15_compiler], }, 'cross_emscripten': { 'compilers': [emscripten_compiler_current], @@ -78,10 +78,10 @@ if get_option('run_in_ci') 'compilers': [msvc_compiler_current], }, 'msys2': { - 'compilers': [gcc_14_compiler], + 'compilers': [gcc_15_compiler], }, 'linux': { - 'compilers': [clang_20_compiler, gcc_14_compiler], + 'compilers': [clang_20_compiler, gcc_15_compiler], }, 'darwin': { 'compilers': [clang_20_compiler],