Skip to content

Commit c4f54a9

Browse files
ben-p-commitsalexjg
authored andcommitted
Update CI to use swift 6.2.3 and latest xcode
1 parent 996ff09 commit c4f54a9

2 files changed

Lines changed: 10 additions & 35 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77

88
jobs:
99
automerge-dependencies:
10-
runs-on: macos-14
10+
runs-on: macos-latest
1111
env:
1212
LOCAL_BUILD: true
13-
DEVELOPER_DIR: /Applications/Xcode_15.4.app
13+
DEVELOPER_DIR: /Applications/Xcode.app
1414
concurrency:
1515
group: automerge-dependencies-${{ github.head_ref || github.run_id }}
1616
cancel-in-progress: true
@@ -31,8 +31,6 @@ jobs:
3131
profile: minimal
3232
toolchain: 1.89.0
3333
default: true
34-
- name: Select Xcode 15.4
35-
run: sudo xcode-select -s /Applications/Xcode_15.4.app
3634
- name: Build Automerge XCFramework and library
3735
if: steps.cache-automerge.outputs.cache-hit != 'true'
3836
run: ./scripts/build-xcframework.sh
@@ -48,12 +46,10 @@ jobs:
4846
libuniffi_automerge_threads.a
4947
5048
mac:
51-
runs-on: macos-14
49+
runs-on: macos-latest
5250
needs: automerge-dependencies
5351
steps:
5452
- uses: actions/checkout@v4
55-
- name: Select Xcode 15.4
56-
run: sudo xcode-select -s /Applications/Xcode_15.4.app
5753
- name: Restore Automerge XCFramework and library
5854
uses: actions/cache/restore@v4
5955
with:
@@ -73,12 +69,6 @@ jobs:
7369
wasm:
7470
runs-on: ubuntu-latest
7571
needs: automerge-dependencies
76-
strategy:
77-
matrix:
78-
include:
79-
- toolchain: swift-DEVELOPMENT-SNAPSHOT-2024-10-08-a
80-
swift-sdk: swift-wasm-DEVELOPMENT-SNAPSHOT-2024-10-15-a
81-
checksum: 229cd9d3b0ed582c7ef7c3064888ad78764e4743b5a770df92554a94513f53fb
8272
steps:
8373
- uses: actions/checkout@v4
8474
- uses: bytecodealliance/actions/wasmtime/setup@v1
@@ -91,30 +81,15 @@ jobs:
9181
libuniffi_automerge.a
9282
libuniffi_automerge_threads.a
9383
key: automerge-dependencies-{{ hashFiles(AutomergeUniffi/automerge.swift) }}-{{ hashFiles(AutomergeUniffi/automergeFFI.h) }}-{{ hashFiles(rust/Cargo.lock) }}-{{ hashFiles(rust/src/doc.rs) }}
94-
- name: Cache Toolchain for WebAssembly
95-
id: cache-wasm-toolchain
96-
uses: actions/cache@v4
84+
- uses: swift-actions/setup-swift@v3
9785
with:
98-
path: /tmp/swift-toolchain.tar.gz
99-
key: wasm-toolchain-${{ matrix.checksum }}
100-
- name: Download Toolchain for WebAssembly
101-
if: steps.cache-wasm-toolchain.outputs.cache-hit != 'true'
102-
run: |
103-
SWIFT_TOOLCHAIN_TAG="${{ matrix.toolchain }}"
104-
set -ex
105-
curl -f -o /tmp/swift-toolchain.tar.gz "https://download.swift.org/development/ubuntu2204/$SWIFT_TOOLCHAIN_TAG/$SWIFT_TOOLCHAIN_TAG-ubuntu22.04.tar.gz"
106-
- name: Install Swift and Swift SDK for WebAssembly
107-
run: |
108-
PREFIX=/opt/swift
109-
SWIFT_SDK_TAG="${{ matrix.swift-sdk }}"
110-
set -ex
111-
sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift-toolchain.tar.gz -C $PREFIX --strip-component 1
112-
$PREFIX/usr/bin/swift sdk install "https://github.com/swiftwasm/swift/releases/download/$SWIFT_SDK_TAG/$SWIFT_SDK_TAG-wasm32-unknown-wasi.artifactbundle.zip" --checksum ${{ matrix.checksum }}
113-
echo "$PREFIX/usr/bin" >> $GITHUB_PATH
86+
swift-version: "6.2.3"
87+
- name: Install Swift SDK for WebAssembly
88+
run: swift sdk install https://download.swift.org/swift-6.2.3-release/wasm-sdk/swift-6.2.3-RELEASE/swift-6.2.3-RELEASE_wasm.artifactbundle.tar.gz --checksum 394040ecd5260e68bb02f6c20aeede733b9b90702c2204e178f3e42413edad2a
11489
- name: Build tests
115-
run: swift build --swift-sdk wasm32-unknown-wasi --build-tests -Xlinker "`pwd`/libuniffi_automerge.a" -Xlinker -z -Xlinker stack-size=$((1024 * 1024))
90+
run: swift build --swift-sdk swift-6.2.3-RELEASE_wasm --build-tests -Xlinker "`pwd`/libuniffi_automerge.a" -Xlinker -z -Xlinker stack-size=$((1024 * 1024))
11691
- name: Run tests
117-
run: wasmtime run --wasm max-wasm-stack=$((1024 * 1024)) --dir . .build/debug/AutomergePackageTests.wasm
92+
run: wasmtime run --wasm max-wasm-stack=$((1024 * 1024)) --dir . .build/wasm32-unknown-wasip1/debug/AutomergePackageTests.xctest
11893

11994
rustfmt:
12095
runs-on: macos-latest

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.6
1+
6.2.3

0 commit comments

Comments
 (0)