Skip to content

Commit dc74448

Browse files
committed
ci: clang32 on msys2 is EOL
backport of 70f657e (cherry picked from commit ed2c004)
1 parent 155f99a commit dc74448

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class SdlPlatform(Enum):
5757
class Msys2Platform(Enum):
5858
Mingw32 = "mingw32"
5959
Mingw64 = "mingw64"
60-
Clang32 = "clang32"
6160
Clang64 = "clang64"
6261
Ucrt64 = "ucrt64"
6362

@@ -107,7 +106,6 @@ class JobSpec:
107106
JOB_SPECS = {
108107
"msys2-mingw32": JobSpec(name="Windows (msys2, mingw32)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msys2, artifact="SDL-mingw32", msys2_platform=Msys2Platform.Mingw32, ),
109108
"msys2-mingw64": JobSpec(name="Windows (msys2, mingw64)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msys2, artifact="SDL-mingw64", msys2_platform=Msys2Platform.Mingw64, ),
110-
"msys2-clang32": JobSpec(name="Windows (msys2, clang32)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msys2, artifact="SDL-mingw32-clang", msys2_platform=Msys2Platform.Clang32, ),
111109
"msys2-clang64": JobSpec(name="Windows (msys2, clang64)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msys2, artifact="SDL-mingw64-clang", msys2_platform=Msys2Platform.Clang64, ),
112110
"msys2-ucrt64": JobSpec(name="Windows (msys2, ucrt64)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msys2, artifact="SDL-mingw64-ucrt", msys2_platform=Msys2Platform.Ucrt64, ),
113111
"msvc-x64": JobSpec(name="Windows (MSVC, x64)", os=JobOs.WindowsLatest, platform=SdlPlatform.Msvc, artifact="SDL-VC-x64", msvc_arch=MsvcArch.X64, msvc_project="VisualC/SDL.sln", ),
@@ -627,7 +625,7 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
627625
"clang64": "mingw-w64-clang-x86_64",
628626
"ucrt64": "mingw-w64-ucrt-x86_64",
629627
}[spec.msys2_platform.value]
630-
job.msys2_no_perl = spec.msys2_platform in (Msys2Platform.Mingw32, Msys2Platform.Clang32)
628+
job.msys2_no_perl = spec.msys2_platform in (Msys2Platform.Mingw32, )
631629
job.shared_lib = SharedLibType.WIN32
632630
job.static_lib = StaticLibType.A
633631
case SdlPlatform.Riscos:

0 commit comments

Comments
 (0)