Skip to content

Commit aca7d46

Browse files
committed
CI: rust-analyzer again
1 parent 9043375 commit aca7d46

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,22 @@ jobs:
9595
run: |
9696
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
9797
. "$HOME/.cargo/env"
98-
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
9998
# We need a nightly rust-analyzer for the Rust SCIP tests.
10099
# 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
103-
# rust-analyzer in the default (stable) toolchain.
100+
# into LOCAL_BIN, bypassing the rustup proxy which would
101+
# try to find rust-analyzer in the default (stable)
102+
# toolchain. We intentionally do NOT add ~/.cargo/bin to
103+
# GITHUB_PATH, so that the proxy doesn't shadow our
104+
# symlink in LOCAL_BIN.
104105
rustup toolchain install nightly-2025-06-11
105106
rustup component add rust-analyzer --toolchain nightly-2025-06-11
106107
NIGHTLY_DIR="$(rustup run nightly-2025-06-11 rustc --print sysroot)/bin"
107108
ln -sf "$NIGHTLY_DIR/rust-analyzer" "$LOCAL_BIN"/rust-analyzer
108109
109110
- name: Build scip-to-glean
110-
run: cd glean/lang/scip/indexer/scip_to_glean && cargo build --release
111+
run: |
112+
. "$HOME/.cargo/env"
113+
cd glean/lang/scip/indexer/scip_to_glean && cargo build --release
111114
112115
- name: Setup Haskell
113116
run: |

0 commit comments

Comments
 (0)