Skip to content

Commit 7fe49da

Browse files
committed
Removed UWP workflow from CI
The GitHub runners no longer have the needed SDK for this (cherry picked from commit ecb7214)
1 parent 0efcafc commit 7fe49da

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

.github/workflows/create-test-plan.py

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ class JobSpec:
9696
msvc_static_crt: bool = False
9797
clang_cl: bool = False
9898
gdk: bool = False
99-
uwp: bool = False
10099
vita_gles: Optional[VitaGLES] = None
101100
watcom_platform: Optional[WatcomPlatform] = None
102101

@@ -113,7 +112,6 @@ class JobSpec:
113112
"msvc-clang-x64": JobSpec(name="Windows (MSVC, clang-cl x64)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msvc, artifact="SDL-clang-cl-x64", msvc_arch=MsvcArch.X64, clang_cl=True, ),
114113
"msvc-clang-x86": JobSpec(name="Windows (MSVC, clang-cl x86)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msvc, artifact="SDL-clang-cl-x86", msvc_arch=MsvcArch.X86, clang_cl=True, ),
115114
"msvc-arm64": JobSpec(name="Windows (MSVC, ARM64)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msvc, artifact="SDL-VC-arm64", msvc_arch=MsvcArch.Arm64, ),
116-
"msvc-uwp-x64": JobSpec(name="UWP (MSVC, x64)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msvc, artifact="SDL-VC-UWP", msvc_arch=MsvcArch.X64, msvc_project="VisualC-WinRT/SDL-UWP.sln", uwp=True, ),
117115
"msvc-gdk-x64": JobSpec(name="GDK (MSVC, x64)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msvc, artifact="SDL-VC-GDK", msvc_arch=MsvcArch.X64, msvc_project="VisualC-GDK/SDL.sln", gdk=True, no_cmake=True, ),
118116
"ubuntu-22.04": JobSpec(name="Ubuntu 22.04", os=JobOs.Ubuntu22_04, platform=SdlPlatform.Linux, artifact="SDL-ubuntu22.04", autotools=True),
119117
"steamrt-sniper": JobSpec(name="Steam Linux Runtime (Sniper)", os=JobOs.UbuntuLatest, platform=SdlPlatform.Linux, artifact="SDL-slrsniper", container="registry.gitlab.steamos.cloud/steamrt/sniper/sdk:beta", ),
@@ -365,10 +363,7 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
365363
"-DCMAKE_EXE_LINKER_FLAGS=-DEBUG",
366364
"-DCMAKE_SHARED_LINKER_FLAGS=-DEBUG",
367365
))
368-
if spec.uwp:
369-
job.cmake_arguments.append("'-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>DLL'")
370-
else:
371-
job.cmake_arguments.append("'-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>'")
366+
job.cmake_arguments.append("'-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>'")
372367

373368
if spec.clang_cl:
374369
job.cmake_arguments.extend((
@@ -403,14 +398,7 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
403398
case MsvcArch.Arm64:
404399
job.msvc_vcvars_arch = "x64_arm64"
405400
job.run_tests = False
406-
if spec.uwp:
407-
job.build_tests = False
408-
job.cmake_arguments.extend((
409-
"-DCMAKE_SYSTEM_NAME=WindowsStore",
410-
"-DCMAKE_SYSTEM_VERSION=10.0",
411-
))
412-
job.msvc_project_flags.append("-p:WindowsTargetPlatformVersion=10.0.17763.0")
413-
elif spec.gdk:
401+
if spec.gdk:
414402
job.setup_gdk_folder = "VisualC-GDK"
415403
else:
416404
match spec.msvc_arch:

0 commit comments

Comments
 (0)