Skip to content

Commit a7a2176

Browse files
Try faster runners and rust cache to match rust SDK
1 parent 634be84 commit a7a2176

2 files changed

Lines changed: 15 additions & 36 deletions

File tree

.github/workflows/builds.yml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,15 @@ jobs:
7171
name: linux-arm64
7272
build_cmd: ./build.sh release-examples
7373
build_dir: build-release
74-
- os: macos-latest
74+
# macos-latest currently maps to a lower-spec 3-core/7GB arm64 image;
75+
# macos-26 gives us 4 cores/14GB on the standard free runner tier.
76+
- os: macos-26
7577
name: macos-arm64
7678
build_cmd: ./build.sh release-examples
7779
build_dir: build-release
78-
- os: macos-latest
80+
# Use the explicit Intel image for x64 with the same 4-core/14GB profile
81+
# instead of cross-building on the lower-spec macos-latest arm64 runner.
82+
- os: macos-26-intel
7983
name: macos-x64
8084
build_cmd: ./build.sh release-examples --macos-arch x86_64
8185
build_dir: build-release
@@ -149,22 +153,10 @@ jobs:
149153
run: rustup target add x86_64-apple-darwin
150154

151155
# ---------- Cache Cargo ----------
152-
- name: Cache Cargo registry
153-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
156+
- name: Cache Cargo
157+
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
154158
with:
155-
path: |
156-
~/.cargo/registry
157-
~/.cargo/git
158-
key: ${{ runner.os }}-${{ matrix.name }}-cargo-reg-${{ hashFiles('**/Cargo.lock') }}
159-
restore-keys: ${{ runner.os }}-${{ matrix.name }}-cargo-reg-
160-
161-
- name: Cache Cargo target
162-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
163-
with:
164-
path: client-sdk-rust/target
165-
key: ${{ runner.os }}-${{ matrix.name }}-cargo-target-${{ hashFiles('**/Cargo.lock') }}
166-
restore-keys: |
167-
${{ runner.os }}-${{ matrix.name }}-cargo-target-
159+
workspaces: client-sdk-rust -> target
168160

169161
# ---------- Build environment setup ----------
170162
- name: Set Linux build environment

.github/workflows/tests.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ jobs:
4545
include:
4646
- os: ubuntu-latest
4747
name: linux-x64
48-
- os: macos-latest
48+
# macos-latest currently maps to a lower-spec 3-core/7GB arm64 image;
49+
# macos-26 gives us 4 cores/14GB on the standard free runner tier.
50+
- os: macos-26
4951
name: macos-arm64
5052

5153
name: Test (${{ matrix.name }})
@@ -95,25 +97,10 @@ jobs:
9597
toolchain: stable
9698

9799
# ---------- Cache Cargo ----------
98-
# Share cache keys with builds.yml so the two workflows reuse each
99-
# other's cargo registry / target output instead of doubling network
100-
# and disk I/O.
101-
- name: Cache Cargo registry
102-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
100+
- name: Cache Cargo
101+
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
103102
with:
104-
path: |
105-
~/.cargo/registry
106-
~/.cargo/git
107-
key: ${{ runner.os }}-${{ matrix.name }}-cargo-reg-${{ hashFiles('**/Cargo.lock') }}
108-
restore-keys: ${{ runner.os }}-${{ matrix.name }}-cargo-reg-
109-
110-
- name: Cache Cargo target
111-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
112-
with:
113-
path: client-sdk-rust/target
114-
key: ${{ runner.os }}-${{ matrix.name }}-cargo-target-${{ hashFiles('**/Cargo.lock') }}
115-
restore-keys: |
116-
${{ runner.os }}-${{ matrix.name }}-cargo-target-
103+
workspaces: client-sdk-rust -> target
117104

118105
# ---------- Build environment setup ----------
119106
- name: Set Linux build environment

0 commit comments

Comments
 (0)