Skip to content

Commit 4103161

Browse files
committed
ci: clarify macOS rustup shim workaround scope (#1151)
Greptile noted that the step name ("macos-14 shim workaround") and PR description suggested the fix only targets macos-14, while runner.os == 'macOS' also covers macos-latest/aarch64-native. Issue #1136 also recorded an aarch64-apple-darwin failure, so keeping the broader guard is correct. Update the step name and comment to reflect that the workaround intentionally applies to all macOS matrix entries as a safety net.
1 parent 01ffb12 commit 4103161

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

.github/workflows/build-native.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,16 @@ jobs:
6767
with:
6868
targets: ${{ matrix.target }}
6969

70-
- name: Verify cargo resolves to rustup proxy (macos-14 shim workaround)
70+
- name: Verify cargo resolves to rustup proxy (macOS shim workaround)
7171
if: runner.os == 'macOS'
7272
shell: bash
7373
run: |
74-
# macos-14 ARM runners intermittently expose a stale `cargo` on
75-
# PATH that resolves to `rustup-init`, breaking `cargo metadata`
76-
# invocations from napi-rs (#1136). Force the rustup proxy bin
77-
# dir to the front of PATH and fail fast if cargo is unhealthy.
74+
# macOS runners (most often `macos-14` ARM, but also observed on
75+
# `macos-latest`/aarch64 builds — see #1136) intermittently expose
76+
# a stale `cargo` on PATH that resolves to `rustup-init`, breaking
77+
# `cargo metadata` invocations from napi-rs. Force the rustup
78+
# proxy bin dir to the front of PATH and fail fast if cargo is
79+
# unhealthy. Applied to all macOS matrix entries as a safety net.
7880
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
7981
"$HOME/.cargo/bin/cargo" --version
8082
"$HOME/.cargo/bin/rustc" --version

.github/workflows/publish.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,16 @@ jobs:
176176
with:
177177
targets: ${{ matrix.target }}
178178

179-
- name: Verify cargo resolves to rustup proxy (macos-14 shim workaround)
179+
- name: Verify cargo resolves to rustup proxy (macOS shim workaround)
180180
if: runner.os == 'macOS'
181181
shell: bash
182182
run: |
183-
# macos-14 ARM runners intermittently expose a stale `cargo` on
184-
# PATH that resolves to `rustup-init`, breaking `cargo metadata`
185-
# invocations from napi-rs (#1136). Force the rustup proxy bin
186-
# dir to the front of PATH and fail fast if cargo is unhealthy.
183+
# macOS runners (most often `macos-14` ARM, but also observed on
184+
# `macos-latest`/aarch64 builds — see #1136) intermittently expose
185+
# a stale `cargo` on PATH that resolves to `rustup-init`, breaking
186+
# `cargo metadata` invocations from napi-rs. Force the rustup
187+
# proxy bin dir to the front of PATH and fail fast if cargo is
188+
# unhealthy. Applied to all macOS matrix entries as a safety net.
187189
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
188190
"$HOME/.cargo/bin/cargo" --version
189191
"$HOME/.cargo/bin/rustc" --version

0 commit comments

Comments
 (0)