Skip to content

Commit 5c711ca

Browse files
committed
fix: fix compilation of the flatpak image
- allow gcc 14 and 15 under linux - disable sdl2_image tests for the flatpak test run
1 parent 64a8f20 commit 5c711ca

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

io.github.openbrickprotocolfoundation.oopetris.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ modules:
1515
- --fatal-meson-warnings
1616
- -Drun_in_ci=true # note we always want the CI checks in the case we built the flatpak
1717
- --force-fallback-for=fmt # note, the freedesktop sdk has this installed, but it is not copiable into the runtime, so we need to build it ourself, to be able to install it correctly
18+
- -Dsdl2_image:test=false # disable failing sdl2_image tests
1819
builddir: true
1920
build-options:
2021
build-args:

tools/options/meson.build

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ if get_option('run_in_ci')
6161
'checks': ['>=15', '<16'],
6262
}
6363

64+
gcc_14_or_15_compiler = {
65+
'id': 'gcc',
66+
'checks': ['>=14', '<16'],
67+
}
68+
6469
msvc_compiler_current = {
6570
'id': 'msvc',
6671
'checks': ['>=19.43', '<20'],
@@ -91,7 +96,7 @@ if get_option('run_in_ci')
9196
'compilers': [gcc_15_compiler],
9297
},
9398
'linux': {
94-
'compilers': [clang_20_compiler, gcc_14_compiler],
99+
'compilers': [clang_20_compiler, gcc_14_or_15_compiler],
95100
},
96101
'darwin': {
97102
'compilers': [clang_20_compiler],

0 commit comments

Comments
 (0)