mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-18 06:01:19 +02:00
Code Issues Projects Releases Wiki Activity

Bump some ghactions jobs to windows-2022

Browse Source
This commit is contained in:
Tamás Bálint Misius
2025-06-04 14:53:05 +02:00
parent d14d35982a
commit bb4251adef
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/build.sh vendored
View File

@@ -144,7 +144,7 @@ if [[ $BSH_HOST_PLATFORM-$BSH_HOST_LIBC == windows-msvc ]]; then
case $BSH_HOST_ARCH in
x86_64) vs_env_arch=x64 ; vcvars_ver=14.29;;
x86) vs_env_arch=x86 ; vcvars_ver=14.29;;
aarch64) vs_env_arch=x64_arm64; vcvars_ver=14.29;;
aarch64) vs_env_arch=x64_arm64; vcvars_ver=14.43;;
esac
VS_ENV_PARAMS=$vs_env_arch$'\t'-vcvars_ver=${BSH_VS_TOOLSET-$vcvars_ver}
. ./.github/vs-env.sh

36
.github/prepare.py vendored
View File

@@ -142,24 +142,24 @@ for arch, platform, libc, statdyn, bplatform, runso
# ( 'x86_64', 'windows', 'mingw', 'static', 'linux', 'ubuntu-22.04', '', 'archive', '.dbg', None, None, 'release', 10, False ), # ubuntu-22.04 doesn't have windows TLS headers somehow and I haven't yet figured out how to get them; worse, it's a different toolchain
# ( 'x86_64', 'windows', 'mingw', 'dynamic', 'linux', 'ubuntu-22.04', '', 'check', None, None, None, 'debug', 10, False ), # ubuntu-22.04 doesn't have ucrt64-capable mingw >_>
# ( 'x86_64', 'windows', 'mingw', 'dynamic', 'linux', 'ubuntu-22.04', '', 'check', None, None, None, 'release', 10, False ), # ubuntu-22.04 doesn't have ucrt64-capable mingw >_>
( 'x86_64', 'windows', 'mingw', 'static', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'x86_64', 'windows', 'mingw', 'static', 'windows', 'windows-2019', '.exe', 'archive', '.dbg', None, None, 'release', 10, False ),
( 'x86_64', 'windows', 'mingw', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'debug', 10, False ),
( 'x86_64', 'windows', 'mingw', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'release', 10, True ),
( 'x86_64', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'x86_64', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', 'publish', '.pdb', None, 'x86_64-win-msvc-static', 'release', 10, False ),
( 'x86_64', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', 'publish', '.pdb', 'steam', 'x86_64-win-msvc-static', 'release', -5, False ), # priority = -5: steam build
( 'x86_64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'debug', 10, False ),
# ( 'x86_64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, 'backendvs', None, 'debug', 0, False ), # priority = 0: backend=vs build
( 'x86_64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'release', 10, False ),
( 'x86', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'x86', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', 'publish', '.pdb', None, 'i686-win-msvc-static', 'release', 10, False ),
( 'x86', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'debug', 10, False ),
( 'x86', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'release', 10, False ),
( 'aarch64', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'aarch64', 'windows', 'msvc', 'static', 'windows', 'windows-2019', '.exe', 'publish', '.pdb', None, 'arm64-win-msvc-static', 'release', 10, False ),
( 'aarch64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'debug', 10, False ),
( 'aarch64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2019', '.exe', 'check', None, None, None, 'release', 10, False ),
( 'x86_64', 'windows', 'mingw', 'static', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'x86_64', 'windows', 'mingw', 'static', 'windows', 'windows-2022', '.exe', 'archive', '.dbg', None, None, 'release', 10, False ),
( 'x86_64', 'windows', 'mingw', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'debug', 10, False ),
( 'x86_64', 'windows', 'mingw', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'release', 10, True ),
( 'x86_64', 'windows', 'msvc', 'static', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'x86_64', 'windows', 'msvc', 'static', 'windows', 'windows-2022', '.exe', 'publish', '.pdb', None, 'x86_64-win-msvc-static', 'release', 10, False ),
( 'x86_64', 'windows', 'msvc', 'static', 'windows', 'windows-2022', '.exe', 'publish', '.pdb', 'steam', 'x86_64-win-msvc-static', 'release', -5, False ), # priority = -5: steam build
( 'x86_64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'debug', 10, False ),
# ( 'x86_64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, 'backendvs', None, 'debug', 0, False ), # priority = 0: backend=vs build
( 'x86_64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'release', 10, False ),
( 'x86', 'windows', 'msvc', 'static', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'x86', 'windows', 'msvc', 'static', 'windows', 'windows-2022', '.exe', 'publish', '.pdb', None, 'i686-win-msvc-static', 'release', 10, False ),
( 'x86', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'debug', 10, False ),
( 'x86', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'release', 10, False ),
( 'aarch64', 'windows', 'msvc', 'static', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'aarch64', 'windows', 'msvc', 'static', 'windows', 'windows-2022', '.exe', 'publish', '.pdb', None, 'arm64-win-msvc-static', 'release', 10, False ),
( 'aarch64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'debug', 10, False ),
( 'aarch64', 'windows', 'msvc', 'dynamic', 'windows', 'windows-2022', '.exe', 'check', None, None, None, 'release', 10, False ),
( 'x86_64', 'darwin', 'macos', 'static', 'darwin', 'macos-13', '.dmg', 'check', None, None, None, 'debug', 0, False ), # priority = 0: static debug build
( 'x86_64', 'darwin', 'macos', 'static', 'darwin', 'macos-13', '.dmg', 'publish', None, None, 'x86_64-mac-gcc-static', 'release', 10, False ), # I have no idea how to separate debug info on macos
( 'x86_64', 'darwin', 'macos', 'static', 'darwin', 'macos-13', '.dmg', 'publish', None, 'steam', 'x86_64-mac-gcc-static', 'release', -5, False ), # priority = -5: steam build, see above regarding debug info

4
.github/vs-env.sh vendored
View File

@@ -22,6 +22,10 @@ if [[ -z "${DevEnvDir-}" ]]; then
done
IFS=$'\t\n'
echo "=== begin VC\\Tools\\MSVC dump ==="
ls -la "$vs_install_dir\\VC\\Tools\\MSVC"
echo "=== end VC\\Tools\\MSVC dump ==="
for i in $(MSYS_NO_PATHCONV=1 cmd /c "$vs_install_dir\\VC\\Auxiliary\\Build\\vcvarsall.bat" $VS_ENV_PARAMS \& env \& exit /b); do
set +e
export "$i" 2>/dev/null