Skip to content

Commit 3b83861

Browse files
committed
Fix the expansion of the Linux host arch matrix
1 parent fe7a90a commit 3b83861

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
# Linux
2828
linux_os_versions: '["jammy", "rhel-ubi9", "amazonlinux2"]'
29-
linux_host_archs: '["x86_64", "aarch64"]'
29+
linux_host_archs: '["x86_64"]'
3030
linux_build_command: |
3131
cd tests/TestPackage
3232
swift build

.github/workflows/swift_package_test.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ on:
5353
linux_host_archs:
5454
type: string
5555
description: "Linux arch list (JSON)"
56-
default: "[\"x86_64\"]"
56+
default: "[\"x86_64\", \"aarch64\"]"
57+
linux_exclude_host_archs:
58+
type: string
59+
description: "Exclude Linux arch list (JSON)"
60+
default: "[{\"arch\": \"aarch64\"}]"
5761
linux_static_sdk_versions:
5862
type: string
5963
description: "Static Linux Swift SDK version list (JSON)"
@@ -313,6 +317,7 @@ jobs:
313317
arch: ${{ fromJson(inputs.linux_host_archs) }}
314318
exclude:
315319
- ${{ fromJson(inputs.linux_exclude_swift_versions) }}
320+
- ${{ fromJson(inputs.linux_exclude_host_archs) }}
316321
- ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_swift_versions) || '[]') }}
317322
- ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_os_versions) || '[]') }}
318323
- ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_host_archs) || '[]') }}
@@ -387,6 +392,7 @@ jobs:
387392
arch: ${{ fromJson(inputs.linux_host_archs) }}
388393
exclude:
389394
- ${{ fromJson(inputs.linux_static_sdk_exclude_swift_versions) }}
395+
- ${{ fromJson(inputs.linux_exclude_host_archs) }}
390396
- ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_static_sdk_versions) || '[]') }}
391397
- ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_os_versions) || '[]') }}
392398
- ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_host_archs) || '[]') }}

0 commit comments

Comments
 (0)