Skip to content

Commit 9043375

Browse files
committed
CI: yet one more rust-analyzer fix
1 parent 1ebe2d7 commit 9043375

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,14 @@ jobs:
9797
. "$HOME/.cargo/env"
9898
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
9999
# We need a nightly rust-analyzer for the Rust SCIP tests.
100-
# We symlink the real binary into LOCAL_BIN rather than
101-
# relying on the rustup proxy, which would try to find
100+
# We symlink the real binary from the toolchain directory
101+
# into LOCAL_BIN (which precedes ~/.cargo/bin in PATH),
102+
# bypassing the rustup proxy which would try to find
102103
# rust-analyzer in the default (stable) toolchain.
103104
rustup toolchain install nightly-2025-06-11
104105
rustup component add rust-analyzer --toolchain nightly-2025-06-11
105-
ln -sf "$(rustup run nightly-2025-06-11 which rust-analyzer)" "$LOCAL_BIN"/rust-analyzer
106+
NIGHTLY_DIR="$(rustup run nightly-2025-06-11 rustc --print sysroot)/bin"
107+
ln -sf "$NIGHTLY_DIR/rust-analyzer" "$LOCAL_BIN"/rust-analyzer
106108
107109
- name: Build scip-to-glean
108110
run: cd glean/lang/scip/indexer/scip_to_glean && cargo build --release

0 commit comments

Comments
 (0)