Skip to content

build: update to gcc 15 #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

build: update to gcc 15 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b97b0dc
build: update used gcc version to 15
Totto16 Apr 25, 2025
44e643d
build: update used gcc version to 15 in msys2 envs
Totto16 May 20, 2025
6af9fd2
build: require gcc 15 for all CI builds
Totto16 May 20, 2025
d00d08e
build: update used container versions to latest for nintendo build im…
Totto16 May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nintendo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions tools/options/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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],
Expand All @@ -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],
Expand Down
Loading