all vcpkg builds should work

Rallista · Oct 11, 2024 · 7fe114a · 7fe114a
1 parent 2e71c84
commit 7fe114a
Showing 1 changed file with 31 additions and 7 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -9,10 +9,12 @@ on:
 jobs:
   build:
     runs-on: macos-14
+    strategy:
+      matrix:
+        arch: ["iphoneos", "iphonesimulator", "iphonesimulator-legacy"]
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-ios-build
+      group: ${{ github.workflow }}-${{ github.ref }}-ios-build-${{ matrix.arch }}
       cancel-in-progress: true
-    timeout-minutes: 120
 
     steps:
       - name: Checkout Valhalla
@@ -27,17 +29,39 @@ jobs:
           export VCPKG_ROOT=`pwd`/vcpkg
 
       - name: Build for iOS & iOS Simulator
-        run: ./build.sh ios clean
+        run: ./build.sh --ios ${{ matrix.arch }}
 
-      - name: Upload xcframework zip output
+      - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: valhalla-wrapper.xcframework
+          name: valhalla-ios-${{ matrix.arch }}
           path: |
-            build/apple/valhalla-wrapper.xcframework
+            build/apple/${{ matrix.arch }}/iphone*/install
 
-  test:
+  create-xcframework:
     needs: build
+    runs-on: macos-latest
+    steps:
+      - name: Checkout Valhalla
+        uses: actions/checkout@v4
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: build/apple
+
+      - name: Create XCFramework
+        run: |
+          ./scripts/create_xcframework.sh
+
+      - name: Upload XCFramework
+        uses: actions/upload-artifact@v4
+        with:
+          name: valhalla-wrapper.xcframework
+          path: build/apple/valhalla-wrapper.xcframework
+
+  test:
+    needs: create-xcframework
     runs-on: macos-14
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-ios-test