Attempt mozilla#2 to fix rustup in GitHub workflows

mhammond · Mar 4, 2025 · 815d73c · 815d73c
1 parent d867ed1
commit 815d73c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml
@@ -20,6 +20,8 @@ jobs:
           echo `env`
           echo 'rust.targets=linux-x86-64' > local.properties
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          # Prepend ~/.cargo/bin to the path, so it overrides the system installed version
+          export PATH="$HOME/.cargo/bin:$PATH"
           source $HOME/.cargo/env
           rustup toolchain install
 

diff --git a/.github/workflows/dependency-check.yaml b/.github/workflows/dependency-check.yaml
@@ -51,8 +51,12 @@ jobs:
       - name: Install Rust
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          # Prepend ~/.cargo/bin to the path, so it overrides the system installed version
+          export PATH="$HOME/.cargo/bin:$PATH"
           source $HOME/.cargo/env
           rustup toolchain install
+          # Needed because `tools/dependency_summary.py` uses nightly
+          rustup toolchain install nightly
       - name: Run Cargo Audit
         run: |
             # cargo-audit 0.20 is giving us trouble in CI - it's failing to build the package.

diff --git a/.github/workflows/update-remote-settings-dumps.yaml b/.github/workflows/update-remote-settings-dumps.yaml
@@ -28,6 +28,8 @@ jobs:
       - name: Set up repository and install Rust
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          # Prepend ~/.cargo/bin to the path, so it overrides the system installed version
+          export PATH="$HOME/.cargo/bin:$PATH"
           source $HOME/.cargo/env
           rustup toolchain install