Skip to content

Commit 6321774

Browse files
committed
Add support for Windows on ARM
1 parent 04e4236 commit 6321774

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.github/workflows/swift_package_test.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ on:
8383
type: string
8484
description: "Exclude Windows Swift version list (JSON)"
8585
default: "[{\"swift_version\": \"\"}]"
86+
windows_os_versions:
87+
type: string
88+
description: "Windows OS version label list (JSON)"
89+
default: "[\"windows-2022\", \"windows-11-arm\"]"
8690
swift_flags:
8791
type: string
8892
description: "Swift flags for release version"
@@ -671,13 +675,14 @@ jobs:
671675
bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple=${{ join(fromJson(inputs.android_sdk_triples), ' --android-sdk-triple=') }} --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
672676
673677
windows-build:
674-
name: Windows (${{ matrix.swift_version }} - windows-2022)
675-
if: ${{ inputs.enable_windows_checks }}
676-
runs-on: windows-2022
678+
name: Windows (${{ matrix.swift_version }} - ${{ matrix.os_version }})
679+
if: ${{ inputs.enable_windows_checks && !(inputs.enable_windows_docker && matrix.os_version == 'windows-11-arm') }}
680+
runs-on: ${{ matrix.os_version }}
677681
strategy:
678682
fail-fast: false
679683
matrix:
680684
swift_version: ${{ fromJson(inputs.windows_swift_versions) }}
685+
os_version: ${{ fromJson(inputs.windows_os_versions) }}
681686
exclude:
682687
- ${{ fromJson(inputs.windows_exclude_swift_versions) }}
683688
steps:

0 commit comments

Comments
 (0)