Fix the expansion of the Linux host arch matrix

Author: jakepetroules

.github/workflows/pull_request.yml

@@ -26,7 +26,6 @@ jobs:
     with:
       # Linux
       linux_os_versions: '["jammy", "rhel-ubi9", "amazonlinux2"]'
-      linux_host_archs: '["x86_64", "aarch64"]'
       linux_build_command: |
         cd tests/TestPackage
         swift build

.github/workflows/swift_package_test.yml

@@ -53,7 +53,11 @@ on:
       linux_host_archs:
         type: string
         description: "Linux arch list (JSON)"
-        default: "[\"x86_64\"]"
+        default: "[\"x86_64\", \"aarch64\"]"
+      linux_exclude_host_archs:
+        type: string
+        description: "Exclude Linux arch list (JSON)"
+        default: "[{\"arch\": \"aarch64\"}]"
       linux_static_sdk_versions:
         type: string
         description: "Static Linux Swift SDK version list (JSON)"
@@ -305,22 +309,24 @@ jobs:
   linux-build:
     name: Linux (${{ matrix.swift_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }})
     runs-on: ${{ matrix.runner }}
+    if: ${{ contains(inputs.linux_host_archs, matrix.arch) }}
     strategy:
       fail-fast: false
       matrix:
         swift_version: ${{ fromJson(inputs.linux_swift_versions) }}
         os_version: ${{ fromJson(inputs.linux_os_versions) }}
         arch: ${{ fromJson(inputs.linux_host_archs) }}
-        exclude:
-          - ${{ fromJson(inputs.linux_exclude_swift_versions) }}
-          - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_swift_versions) || '[]') }}
-          - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_os_versions) || '[]') }}
-          - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_host_archs) || '[]') }}
         include:
           - arch: x86_64
             runner: ubuntu-24.04
           - arch: aarch64
             runner: ubuntu-24.04-arm
+        exclude:
+          - ${{ fromJson(inputs.linux_exclude_swift_versions) }}
+          - ${{ fromJson(inputs.linux_exclude_host_archs) }}
+          - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_swift_versions) || '[]') }}
+          - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_os_versions) || '[]') }}
+          - ${{ fromJson((!inputs.enable_linux_checks && inputs.linux_host_archs) || '[]') }}
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     steps:
@@ -385,16 +391,17 @@ jobs:
         swift_version: ${{ fromJson(inputs.linux_static_sdk_versions) }}
         os_version: ${{ fromJson(inputs.linux_os_versions) }}
         arch: ${{ fromJson(inputs.linux_host_archs) }}
-        exclude:
-          - ${{ fromJson(inputs.linux_static_sdk_exclude_swift_versions) }}
-          - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_static_sdk_versions) || '[]') }}
-          - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_os_versions) || '[]') }}
-          - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_host_archs) || '[]') }}
         include:
           - arch: x86_64
             runner: ubuntu-24.04
           - arch: aarch64
             runner: ubuntu-24.04-arm
+        exclude:
+          - ${{ fromJson(inputs.linux_static_sdk_exclude_swift_versions) }}
+          - ${{ fromJson(inputs.linux_exclude_host_archs) }}
+          - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_static_sdk_versions) || '[]') }}
+          - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_os_versions) || '[]') }}
+          - ${{ fromJson((!inputs.enable_linux_static_sdk_build && inputs.linux_host_archs) || '[]') }}
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     steps: