Skip to content

Commit 403683e

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

1 file changed

Lines changed: 17 additions & 2 deletions

File tree

.github/workflows/swift_package_test.yml

Lines changed: 17 additions & 2 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,24 @@ 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)
678+
name: Windows (${{ matrix.swift_version }} - ${{ matrix.os_version }})
675679
if: ${{ inputs.enable_windows_checks }}
676-
runs-on: windows-2022
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(
686+
inputs.enable_windows_docker
687+
&& format('[{0}]', join(
688+
fromJson(inputs.windows_os_versions)
689+
.*[
690+
startsWith('.', '') != '' || . != 'windows-11-arm'
691+
],
692+
','
693+
))
694+
|| inputs.windows_os_versions
695+
) }}
681696
exclude:
682697
- ${{ fromJson(inputs.windows_exclude_swift_versions) }}
683698
steps:

0 commit comments

Comments
 (0)