From bb4251adefe1201d83014726ebcd3f4d74c50e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Wed, 4 Jun 2025 14:53:05 +0200 Subject: [PATCH] Bump some ghactions jobs to windows-2022 --- .github/build.sh | 2 +- .github/prepare.py | 36 ++++++++++++++++++------------------ .github/vs-env.sh | 4 ++++ 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index af1fc6926..6c2b5e7fa 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -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 diff --git a/.github/prepare.py b/.github/prepare.py index c3171f913..1cbe771e2 100755 --- a/.github/prepare.py +++ b/.github/prepare.py @@ -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 diff --git a/.github/vs-env.sh b/.github/vs-env.sh index bf990382e..05bd47f41 100755 --- a/.github/vs-env.sh +++ b/.github/vs-env.sh @@ -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