mirrors/SDL
0
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2024-11-23 02:43:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: pin MSVC ARM Windows SDK version to 10.0.22621.0

Browse Source
This commit is contained in:
Anonymous Maarten 2024-11-17 19:18:06 +01:00
parent 0f9e551d71
commit bd57cfdb55
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/create-test-plan.py vendored
View File

@ -205,7 +205,8 @@ class JobDetails:
msys2_env: str = "" msys2_env: str = ""
msys2_no_perl: bool = False msys2_no_perl: bool = False
werror: bool = True werror: bool = True
msvc_vcvars: str = "" msvc_vcvars_arch: str = ""
msvc_vcvars_sdk: str = ""
msvc_project: str = "" msvc_project: str = ""
msvc_project_flags: list[str] = dataclasses.field(default_factory=list) msvc_project_flags: list[str] = dataclasses.field(default_factory=list)
setup_ninja: bool = False setup_ninja: bool = False
@ -267,7 +268,8 @@ class JobDetails:
"android-mk": self.android_mk, "android-mk": self.android_mk,
"werror": self.werror, "werror": self.werror,
"sudo": self.sudo, "sudo": self.sudo,
"msvc-vcvars": self.msvc_vcvars, "msvc-vcvars-arch": self.msvc_vcvars_arch,
"msvc-vcvars-sdk": self.msvc_vcvars_sdk,
"msvc-project": self.msvc_project, "msvc-project": self.msvc_project,
"msvc-project-flags": my_shlex_join(self.msvc_project_flags), "msvc-project-flags": my_shlex_join(self.msvc_project_flags),
"setup-ninja": self.setup_ninja, "setup-ninja": self.setup_ninja,
@ -391,14 +393,15 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
job.msvc_project_flags.append(f"-p:Platform={msvc_platform}") job.msvc_project_flags.append(f"-p:Platform={msvc_platform}")
match spec.msvc_arch: match spec.msvc_arch:
case MsvcArch.X86: case MsvcArch.X86:
job.msvc_vcvars = "x64_x86" job.msvc_vcvars_arch = "x64_x86"
case MsvcArch.X64: case MsvcArch.X64:
job.msvc_vcvars = "x64" job.msvc_vcvars_arch = "x64"
case MsvcArch.Arm32: case MsvcArch.Arm32:
job.msvc_vcvars = "x64_arm" job.msvc_vcvars_arch = "x64_arm"
job.msvc_vcvars_sdk = "10.0.22621.0" # 10.0.26100.0 dropped ARM32 um and ucrt libraries
job.run_tests = False job.run_tests = False
case MsvcArch.Arm64: case MsvcArch.Arm64:
job.msvc_vcvars = "x64_arm64" job.msvc_vcvars_arch = "x64_arm64"
job.run_tests = False job.run_tests = False
if spec.gdk: if spec.gdk:
job.setup_gdk_folder = "VisualC-GDK" job.setup_gdk_folder = "VisualC-GDK"

3
.github/workflows/generic.yml vendored
View File

@ -90,7 +90,8 @@ jobs:
- uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/msvc-dev-cmd@v1
if: ${{ matrix.platform.platform == 'msvc' }} if: ${{ matrix.platform.platform == 'msvc' }}
with: with:
arch: ${{ matrix.platform.msvc-vcvars }} arch: ${{ matrix.platform.msvc-vcvars-arch }}
sdk: ${{ matrix.platform.msvc-vcvars-sdk }}
- name: 'Set up Windows GDK Desktop' - name: 'Set up Windows GDK Desktop'
uses: ./.github/actions/setup-gdk-desktop uses: ./.github/actions/setup-gdk-desktop
if: ${{ matrix.platform.setup-gdk-folder != '' }} if: ${{ matrix.platform.setup-gdk-folder != '' }}