Skip to content

Commit 382ba23

Browse files
committed
ci: force rust version to unify OS builds
1 parent 8c52e12 commit 382ba23

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.github/workflows/release.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
with:
6161
persist-credentials: false
6262
submodules: recursive
63+
- name: Install Rust
64+
run: rustup update "1.89" --no-self-update && rustup default "1.89"
6365
- name: Install dist
6466
# we specify bash to get pipefail; it guards against the `curl` command
6567
# failing. otherwise `sh` won't catch that `curl` returned non-0
@@ -127,6 +129,8 @@ jobs:
127129
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
128130
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
129131
fi
132+
- name: Use rustup to set correct Rust version
133+
run: rustup update "1.89" --no-self-update && rustup default "1.89"
130134
- name: Install dist
131135
run: ${{ matrix.install_dist.run }}
132136
# Get the dist-manifest
@@ -179,6 +183,8 @@ jobs:
179183
with:
180184
persist-credentials: false
181185
submodules: recursive
186+
- name: Install Rust
187+
run: rustup update "1.89" --no-self-update && rustup default "1.89"
182188
- name: Install cached dist
183189
uses: actions/download-artifact@v4
184190
with:
@@ -229,6 +235,8 @@ jobs:
229235
with:
230236
persist-credentials: false
231237
submodules: recursive
238+
- name: Install Rust
239+
run: rustup update "1.89" --no-self-update && rustup default "1.89"
232240
- name: Install cached dist
233241
uses: actions/download-artifact@v4
234242
with:

dist-workspace.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ installers = ["shell", "powershell", "homebrew"]
1313
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
1414
# Path that installers should place binaries in
1515
install-path = "CARGO_HOME"
16+
# The preferred Rust toolchain to use in CI (rustup toolchain syntax)
17+
rust-toolchain-version = "1.89"
1618
# Whether to install an updater program
1719
install-updater = true
1820
# A GitHub repo to push Homebrew formulas to
@@ -24,6 +26,5 @@ publish-jobs = ["homebrew"]
2426
global = "ubuntu-22.04"
2527
x86_64-unknown-linux-gnu = "ubuntu-22.04"
2628
aarch64-apple-darwin = "macos-14"
27-
x86_64-apple-darwin = "macos-13"
28-
aarch64-unknown-linux-gnu = "buildjet-2vcpu-ubuntu-2204-arm"
29+
aarch64-unknown-linux-gnu = "ubuntu-22.04-arm"
2930
x86_64-pc-windows-msvc = "windows-2022"

0 commit comments

Comments
 (0)