Update CI to build for all archs in a single matrix

Author: marcprux

.github/workflows/swift.yml

@@ -13,7 +13,6 @@ jobs:
       matrix:
         # os: ['ubuntu-24.04', 'macos-15-intel']
         os: ['ubuntu-24.04']
-        arch: ['aarch64', 'x86_64', 'armv7']
         android-sdk: ['nightly-6.3']
         android-api: ['28', '29', '31', '33']
         android-ndk: ['r27d']
@@ -29,7 +28,8 @@ jobs:
           swift-android-ndk-version: ${{ matrix.android-ndk }}
       - name: "Build Swift Package for Android"
         run: |
-          ANDROID_NDK_ROOT="" ANDROID_SDK_VERSION=${{ matrix.android-api }} skip android build --arch ${{ matrix.arch }} --android-api-level ${{ matrix.android-api }}
+          ANDROID_SDK_VERSION=${{ matrix.android-api }} skip android build --arch aarch64 --arch armv7 --arch x86_64 --android-api-level ${{ matrix.android-api }}
+
       - name: "Test Swift Package on Android"
         # can only lookup the current JavaVirtualMachine on SDK >= 31
         # https://github.com/swiftlang/swift-java/issues/419
@@ -38,5 +38,6 @@ jobs:
         with:
           api-level: ${{ matrix.android-api }}
           arch: x86_64
-          script: skip android test --android-api-level ${{ matrix.android-api }} --apk --verbose
+          script: |
+            ANDROID_SDK_VERSION=${{ matrix.android-api }} skip android test --android-api-level ${{ matrix.android-api }} --apk --verbose