Skip to content

Commit 3049d07

Browse files
committed
fix: refactor the ci config meson code, to be easier to read
1 parent 7a4921e commit 3049d07

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

tools/options/meson.build

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,18 @@ if get_option('run_in_ci')
3535

3636
endif
3737

38-
clang_19_compiler = ['clang', ['>=19', '<20']]
39-
gcc_14_compiler = ['gcc', ['>=14', '<15']]
40-
msvc_compiler_current = ['msvc', ['>=19.43', '<20']]
38+
clang_19_compiler = {
39+
'id': 'clang',
40+
'checks': ['>=19', '<20'],
41+
}
42+
gcc_14_compiler = {
43+
'id': 'gcc',
44+
'checks': ['>=14', '<15'],
45+
}
46+
msvc_compiler_current = {
47+
'id': 'msvc',
48+
'checks': ['>=19.43', '<20'],
49+
}
4150

4251
ci_config = {
4352
'cross_android': {
@@ -78,8 +87,8 @@ if get_option('run_in_ci')
7887
found_compiler_for_ci_config = false
7988

8089
foreach compiler_for_system : compilers_for_system
81-
compiler_for_system_name = compiler_for_system[0]
82-
version_checks_for_compiler = compiler_for_system[1]
90+
compiler_for_system_name = compiler_for_system.get('id')
91+
version_checks_for_compiler = compiler_for_system.get('checks')
8392

8493
if c.get_id() != compiler_for_system_name
8594
continue
@@ -97,7 +106,7 @@ if get_option('run_in_ci')
97106

98107
if not compiler_version.version_compare(version_check_for_compiler)
99108
error(
100-
'The compiler "' + c.get_id() + '" doesn\'t meet the version check ' + version_check_for_compiler
109+
'The compiler "' + c.get_id() + '" doesn\'t meet the version check "' + version_check_for_compiler + '"'
101110
)
102111
endif
103112

0 commit comments

Comments
 (0)