Rebase

Author: grynspan

.github/workflows/swift_package_test.yml

@@ -217,42 +217,8 @@ jobs:
         run: xcrun swift --version
       - name: Clang version
         run: xcrun clang --version
-      - name: Pre-build
-        run: ${{ inputs.macos_pre_build_command }}
-      - name: Build / Test
-        run: ${{ inputs.macos_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
-        timeout-minutes: 60
-
-  macos-build-2:
-    name: FAUX iOS (Build Only, Xcode ${{ matrix.xcode_version }} - ${{ matrix.os_version }} - ${{ matrix.arch }})
-    if: ${{ inputs.enable_macos_checks }}
-    runs-on: [self-hosted, macos, "${{ matrix.os_version }}", "${{ matrix.arch }}"]
-    strategy:
-      fail-fast: false
-      matrix:
-        xcode_version: ${{ fromJson(inputs.macos_xcode_versions) }}
-        os_version: ${{ fromJson(inputs.macos_versions) }}
-        arch: ${{ fromJson(inputs.macos_archs) }}
-        exclude:
-          - ${{ fromJson(inputs.macos_exclude_xcode_versions) }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Provide token
-        if: ${{ inputs.needs_token }}
-        run: |
-            echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
-      - name: Set environment variables
-        if: ${{ inputs.macos_env_vars }}
-        run: |
-            for i in "${{ inputs.macos_env_vars }}"
-            do
-              printf "%s\n" $i >> $GITHUB_ENV
-            done
-      - name: Select Xcode
-        run: echo "DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode_version }}.app" >> $GITHUB_ENV
-      - name: Swift version
-        run: xcrun swift --version
+      - name: Echo inputs.ios_host_xcode_versions
+        run: echo "${{ inputs.ios_host_xcode_versions }}"
       - name: Pre-build
         run: ${{ inputs.macos_pre_build_command }}
       - name: Build / Test
@@ -266,11 +232,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode_version: ${{ fromJson(inputs.macos_xcode_versions) }}
-        os_version: ${{ fromJson(inputs.macos_versions) }}
-        arch: ${{ fromJson(inputs.macos_archs) }}
+        xcode_version: ${{ fromJson(inputs.ios_host_xcode_versions) }}
+        os_version: ${{ fromJson(inputs.ios_host_versions) }}
+        arch: ${{ fromJson(inputs.ios_host_archs) }}
         exclude:
-          - ${{ fromJson(inputs.macos_exclude_xcode_versions) }}
+          - ${{ fromJson(inputs.ios_host_exclude_xcode_versions) }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4