forcing xcode 15.4

minor
automerge · Oct 21, 2024 · 3b2cb60 · 3b2cb60
1 parent db45b15
commit 3b2cb60
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -32,6 +32,8 @@ jobs:
           profile: minimal
           toolchain: 1.81.0
           default: true
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Build Automerge XCFramework and library
         if: steps.cache-automerge.outputs.cache-hit != 'true'
         run: ./scripts/build-xcframework.sh
@@ -46,11 +48,13 @@ jobs:
             libuniffi_automerge.a
             libuniffi_automerge_threads.a
 
-  test-automerge-swift:
+  mac:
     runs-on: macos-14
     needs: automerge-dependencies
     steps:
       - uses: actions/checkout@v4
+      - name: Select Xcode 15.4
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
       - name: Restore Automerge XCFramework and library
         uses: actions/cache/restore@v4
         with:
@@ -65,15 +69,15 @@ jobs:
       - name: Swift tests
         run: swift test
 
-  test-automerge-wasm:
+  wasm:
     runs-on: ubuntu-latest
     needs: automerge-dependencies
     strategy:
       matrix:
         include:
-          - toolchain: swift-DEVELOPMENT-SNAPSHOT-2024-10-08-a
-            swift-sdk: swift-wasm-DEVELOPMENT-SNAPSHOT-2024-10-15-a
-            checksum: 229cd9d3b0ed582c7ef7c3064888ad78764e4743b5a770df92554a94513f53fb
+          - toolchain: swift-5.10-DEVELOPMENT-SNAPSHOT-2024-05-29-a
+            swift-sdk: swift-wasm-5.10.0-RELEASE
+            checksum: 511904522b87c0841b151a46aa9a515ab6eae457f45426922b04c1e461705a3a
     steps:
       - uses: actions/checkout@v4
       - uses: bytecodealliance/actions/wasmtime/setup@v1
@@ -97,7 +101,7 @@ jobs:
         run: |
           SWIFT_TOOLCHAIN_TAG="${{ matrix.toolchain }}"
           set -ex
-          curl -f -o /tmp/swift-sdk.tar.gz "https://download.swift.org/development/ubuntu2204/$SWIFT_TOOLCHAIN_TAG/$SWIFT_TOOLCHAIN_TAG-ubuntu22.04.tar.gz"
+          curl -f -o /tmp/swift-sdk.tar.gz "https://download.swift.org/swift-5.10-branch/ubuntu2204/$SWIFT_TOOLCHAIN_TAG/$SWIFT_TOOLCHAIN_TAG-ubuntu22.04.tar.gz"
       - name: Install Swift and Swift SDK for WebAssembly
         run: |
           PREFIX=/opt/swift