80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

ci: make machine files a bit DRYer

Browse source
This commit is contained in:
Andrei Alexeyev 2023-07-29 03:46:35 +02:00
parent 651a113009
commit 4f6e1cf01a
No known key found for this signature in database
GPG key ID: 72D26128040B9690
16 changed files with 75 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/emscripten-experimental.yml vendored
View file

@ -67,6 +67,7 @@ jobs:
meson setup build/
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/forcefallback.ini
--cross-file misc/ci/emscripten-ephemeral-ci.ini
--cross-file misc/ci/emscripten-build.ini
--prefix=$(pwd)/build-test

4
.github/workflows/main.yml vendored
View file

@ -77,6 +77,7 @@ jobs:
run: >
meson setup build/
--native-file misc/ci/common-options.ini
--native-file misc/ci/nofallback.ini
--native-file misc/ci/linux-x86_64-build-test-ci.ini
--prefix=$(pwd)/build-test
@ -138,6 +139,7 @@ jobs:
run: >
meson setup build/
--native-file misc/ci/common-options.ini
--native-file misc/ci/nofallback.ini
--native-file misc/ci/macos-x86_64-build-test-ci.ini
--prefix=$(pwd)/build-test
@ -175,6 +177,7 @@ jobs:
run: >
meson setup build/
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/forcefallback.ini
--cross-file misc/ci/windows-llvm_mingw-x86_64-build-test-ci.ini
--prefix=$(pwd)/build-test
@ -261,6 +264,7 @@ jobs:
meson setup build/
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/forcefallback.ini
--cross-file misc/ci/emscripten-ephemeral-ci.ini
--cross-file misc/ci/emscripten-build.ini
--prefix=$(pwd)/taisei-web-test

4
.github/workflows/release.yml vendored
View file

@ -80,6 +80,7 @@ jobs:
meson setup build/linux
--native-file misc/ci/common-options.ini
--native-file misc/ci/forcefallback.ini
--native-file misc/ci/linux-x86_64-build-release.ini
--prefix=$(pwd)/build-release
@ -248,6 +249,7 @@ jobs:
-Dangle_libegl=$(pwd)/angle-compiled/lib/Windows-x64-dll/libEGL.dll
-Dangle_libgles=$(pwd)/angle-compiled/lib/Windows-x64-dll/libGLESv2.dll
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/forcefallback.ini
--cross-file misc/ci/windows-llvm_mingw-x86_64-build-release.ini
--prefix=$(pwd)/build-release
@ -329,6 +331,7 @@ jobs:
-Dangle_libegl=$(pwd)/angle-compiled/lib/Windows-x86-dll/libEGL.dll
-Dangle_libgles=$(pwd)/angle-compiled/lib/Windows-x86-dll/libGLESv2.dll
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/forcefallback.ini
--cross-file misc/ci/windows-llvm_mingw-x86-build-release.ini
--prefix=$(pwd)/build-release
@ -448,6 +451,7 @@ jobs:
meson setup build/emscripten
--cross-file misc/ci/common-options.ini
--cross-file misc/ci/forcefallback.ini
--cross-file misc/ci/emscripten-build.ini
--cross-file misc/ci/emscripten-ephemeral-ci.ini
--prefix=$(pwd)/build-release

54
misc/ci/common-options.ini
View file

@ -1,4 +1,7 @@
[built-in options]
werror = true
[project options]
deprecation_warnings = 'no-error'
vfs_zip = 'enabled'
@ -8,5 +11,56 @@ force_vendored_shader_tools = true
validate_glsl = 'disabled'
[sdl2:project options]
test = false
use_joystick_wgi = 'disabled'
[SPIRV-Cross:built-in options]
werror = false
[SPIRV-Headers:built-in options]
werror = false
[SPIRV-Tools:built-in options]
werror = false
[basis_universal:built-in options]
werror = false
[freetype:built-in options]
werror = false
[glslang:built-in options]
werror = false
[libpng:built-in options]
werror = false
[libwebp:built-in options]
werror = false
[libzip:built-in options]
werror = false
[libzstd:built-in options]
werror = false
[ogg:built-in options]
werror = false
[opus:built-in options]
werror = false
[opusfile:built-in options]
werror = false
[sdl2:built-in options]
werror = false
[shaderc:built-in options]
werror = false
[vorbis:built-in options]
werror = false
[zlib:built-in options]
werror = false

1
misc/ci/emscripten-build.ini
View file

@ -36,7 +36,6 @@ cpp_rtti = false
cpp_thread_count = 0
default_library = 'static'
optimization = 's'
wrap_mode = 'forcefallback'
[sdl2:project options]
use_audio_alsa = 'disabled'

6
misc/ci/forcefallback.ini Normal file
View file

@ -0,0 +1,6 @@
[built-in options]
wrap_mode = 'forcefallback'
[sdl2:project options]
system_iconv = 'disabled'

26
misc/ci/linux-x86_64-build-release.ini
View file

@ -12,29 +12,3 @@ c_args = cflags
c_link_args = ldflags
cpp_args = cflags
cpp_link_args = ldflags
wrap_mode = 'forcefallback'
werror = true
[basis_universal:built-in options]
werror = false
[sdl2:built-in options]
werror = false
[libzstd:built-in options]
werror = false
[SPIRV-Cross:built-in options]
werror = false
[SPIRV-Tools:built-in options]
werror = false
[SPIRV-Headers:built-in options]
werror = false
[glslang:built-in options]
werror = false
[shaderc:built-in options]
werror = false

6
misc/ci/linux-x86_64-build-test-ci.ini
View file

@ -10,12 +10,6 @@ c_args = cflags
c_link_args = ldflags
cpp_args = cflags
cpp_link_args = ldflags
wrap_mode = 'nofallback'
force_fallback_for = 'cglm'
werror = true
b_pch = false
b_lto = false
strip = false
[basis_universal:built-in options]
werror = false

33
misc/ci/macos-aarch64-build-release.ini
View file

@ -31,41 +31,8 @@ cpp_link_args = ldflags
# necessary for -mmacosx-version-min to take effect on objc headers when building for macOS
objc_args = cflags
objc_link_args = ldflags
wrap_mode = 'forcefallback'
werror = true
[basis_universal:built-in options]
werror = false
[libzstd:built-in options]
werror = false
[sdl2:built-in options]
werror = false
[libpng:built-in options]
werror = false
[libzip:built-in options]
werror = false
[sdl2:project options]
# neither are necessary for macOS, but SDL2 will compile against them if present on the system (homebrew)
use_audio_pulseaudio = 'disabled'
use_video_x11 = 'disabled'
werror = false
[SPIRV-Cross:built-in options]
werror = false
[SPIRV-Tools:built-in options]
werror = false
[SPIRV-Headers:built-in options]
werror = false
[glslang:built-in options]
werror = false
[shaderc:built-in options]
werror = false

32
misc/ci/macos-x86_64-build-release.ini
View file

@ -13,40 +13,8 @@ cpp_link_args = ldflags
# necessary for -mmacosx-version-min to take effect on objc headers when building for macOS
objc_args = cflags
objc_link_args = ldflags
wrap_mode = 'forcefallback'
werror = true
[basis_universal:built-in options]
werror = false
[libzstd:built-in options]
werror = false
[sdl2:built-in options]
werror = false
[libpng:built-in options]
werror = false
[libzip:built-in options]
werror = false
[sdl2:project options]
# neither are necessary for macOS, but SDL2 will compile against them if present on the system (homebrew)
use_audio_pulseaudio = 'disabled'
use_video_x11 = 'disabled'
[SPIRV-Cross:built-in options]
werror = false
[SPIRV-Tools:built-in options]
werror = false
[SPIRV-Headers:built-in options]
werror = false
[glslang:built-in options]
werror = false
[shaderc:built-in options]
werror = false

6
misc/ci/macos-x86_64-build-test-ci.ini
View file

@ -12,12 +12,6 @@ c_args = cflags
c_link_args = ldflags
cpp_args = cflags
cpp_link_args = ldflags
wrap_mode = 'nofallback'
force_fallback_for = 'cglm'
werror = true
b_pch = false
b_lto = false
strip = false
[basis_universal:built-in options]
werror = false

4
misc/ci/nofallback.ini Normal file
View file

@ -0,0 +1,4 @@
[built-in options]
wrap_mode = 'nofallback'
force_fallback_for = 'cglm'

1
misc/ci/windows-llvm_mingw-x86-build-release.ini
View file

@ -43,7 +43,6 @@ c_args = cflags
c_link_args = ldflags
cpp_args = cflags
cpp_link_args = ldflags
wrap_mode = 'forcefallback'
werror = false
[cmake]

1
misc/ci/windows-llvm_mingw-x86_64-build-release.ini
View file

@ -43,7 +43,6 @@ c_args = cflags
c_link_args = ldflags
cpp_args = cflags
cpp_link_args = ldflags
wrap_mode = 'forcefallback'
werror = false
[cmake]

2
misc/ci/windows-llvm_mingw-x86_64-build-test-ci.ini
View file

@ -39,8 +39,6 @@ c_args = cflags
c_link_args = ldflags
cpp_args = cflags
cpp_link_args = ldflags
wrap_mode = 'forcefallback'
force_fallback_for = 'cglm'
werror = false
strip = false
b_pch = false

2
scripts/macos_setup_universal.sh
View file

@ -7,12 +7,14 @@ source $(pwd)/.mac_env
mkdir -p $MAC_BUILD_DIR/compiled $MESON_BUILD_ROOT_MACOS_COMBINED
meson setup \
--native-file $TAISEI_ROOT/misc/ci/common-options.ini \
--native-file $TAISEI_ROOT/misc/ci/forcefallback.ini \
--native-file $TAISEI_ROOT/misc/ci/macos-x86_64-build-release.ini \
--prefix $MESON_BUILD_ROOT_MACOS_X64_COMPILED \
$MESON_BUILD_ROOT_MACOS_X64 \
$TAISEI_ROOT
meson setup \
--cross-file $TAISEI_ROOT/misc/ci/common-options.ini \
--cross-file $TAISEI_ROOT/misc/ci/forcefallback.ini \
--cross-file $TAISEI_ROOT/misc/ci/macos-aarch64-build-release.ini \
--prefix $MESON_BUILD_ROOT_MACOS_AARCH64_COMPILED \
$MESON_BUILD_ROOT_MACOS_AARCH64 \