Skip to content

Commit df88739

Browse files
committed
Use newer warpbuild runner (#2904)
## tl;dr The MacOS 13 runner is quite slow. We don't need it. Upgrading to 15 lets us use M4 chips, which are about 4X faster than the MacOS 13 Intel chips. Does require a bit of a dance to set the right environment variables.
1 parent afa3ce7 commit df88739

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

.github/workflows/release-swift-bindings-nix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
jobs:
55
build-macos:
6-
runs-on: warp-macos-13-arm64-6x
6+
runs-on: warp-macos-15-arm64-12x
77
strategy:
88
fail-fast: false
99
matrix:
@@ -39,7 +39,7 @@ jobs:
3939
path: target/${{ matrix.target }}/release/libxmtpv3.a
4040
retention-days: 1
4141
swift:
42-
runs-on: warp-macos-13-arm64-6x
42+
runs-on: warp-macos-15-arm64-12x
4343
steps:
4444
- name: Checkout
4545
uses: actions/checkout@v5
@@ -67,7 +67,7 @@ jobs:
6767
retention-days: 1
6868
package-swift:
6969
needs: [build-macos, swift]
70-
runs-on: warp-macos-13-arm64-6x
70+
runs-on: warp-macos-15-arm64-12x
7171
steps:
7272
- name: Checkout
7373
uses: actions/checkout@v5

.github/workflows/release-swift-bindings.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
jobs:
55
build-macos:
6-
runs-on: warp-macos-13-arm64-6x
6+
runs-on: warp-macos-15-arm64-12x
77
strategy:
88
fail-fast: false
99
matrix:
@@ -23,6 +23,7 @@ jobs:
2323
- name: Cache
2424
uses: Swatinem/rust-cache@v2
2525
with:
26+
prefix-key: "macos-15"
2627
workspaces: |
2728
.
2829
bindings_ffi
@@ -31,8 +32,19 @@ jobs:
3132
- name: Build target
3233
env:
3334
CROSS_NO_WARNINGS: "0"
34-
IPHONEOS_DEPLOYMENT_TARGET: 10
35+
IPHONEOS_DEPLOYMENT_TARGET: "10"
3536
run: |
37+
# Set up SDK and clang paths based on target
38+
if [[ "${{ matrix.target }}" == *"-ios-sim"* ]]; then
39+
export SDKROOT=$(xcrun --sdk iphonesimulator --show-sdk-path)
40+
export BINDGEN_EXTRA_CLANG_ARGS="--target=arm64-apple-ios-simulator -isysroot $SDKROOT"
41+
elif [[ "${{ matrix.target }}" == *"-ios" ]]; then
42+
export SDKROOT=$(xcrun --sdk iphoneos --show-sdk-path)
43+
export BINDGEN_EXTRA_CLANG_ARGS="--target=arm64-apple-ios -isysroot $SDKROOT"
44+
elif [[ "${{ matrix.target }}" == "x86_64-apple-ios" ]]; then
45+
export SDKROOT=$(xcrun --sdk iphonesimulator --show-sdk-path)
46+
export BINDGEN_EXTRA_CLANG_ARGS="--target=x86_64-apple-ios-simulator -isysroot $SDKROOT"
47+
fi
3648
cross build --release --target ${{ matrix.target }} --manifest-path bindings_ffi/Cargo.toml
3749
- name: Upload binary
3850
uses: actions/upload-artifact@v5
@@ -43,7 +55,7 @@ jobs:
4355
target/${{ matrix.target }}/release/libxmtpv3.dylib
4456
retention-days: 1
4557
swift:
46-
runs-on: warp-macos-13-arm64-6x
58+
runs-on: warp-macos-15-arm64-12x
4759
steps:
4860
- name: Checkout
4961
uses: actions/checkout@v5
@@ -77,7 +89,7 @@ jobs:
7789
retention-days: 1
7890
package-swift:
7991
needs: [build-macos, swift]
80-
runs-on: warp-macos-13-arm64-6x
92+
runs-on: warp-macos-15-arm64-12x
8193
steps:
8294
- name: Checkout
8395
uses: actions/checkout@v5
@@ -102,7 +114,7 @@ jobs:
102114
if-no-files-found: error
103115
package-swift-dynamic:
104116
needs: [build-macos, swift]
105-
runs-on: warp-macos-13-arm64-6x
117+
runs-on: warp-macos-15-arm64-12x
106118
steps:
107119
- name: Checkout
108120
uses: actions/checkout@v5
@@ -127,7 +139,7 @@ jobs:
127139
if-no-files-found: error
128140
create-release:
129141
needs: [package-swift, package-swift-dynamic]
130-
runs-on: warp-macos-13-arm64-6x
142+
runs-on: warp-macos-15-arm64-12x
131143
steps:
132144
- name: Checkout
133145
uses: actions/checkout@v5

.github/workflows/update-xmtp-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818
id-token: write
1919
jobs:
2020
update-xmtp-ios:
21-
runs-on: warp-macos-13-arm64-6x
21+
runs-on: warp-macos-15-arm64-6x
2222
steps:
2323
- name: Checkout libxmtp
2424
uses: actions/checkout@v5

0 commit comments

Comments
 (0)