Skip to content

Commit 1f73e45

Browse files
authored
Pin nightly to nightly-2025-11-08 for the dependency check (#7086)
Versions after that removed the `--build-plan` feature, so we need to use an older version for dependency-check. Hopefully this lasts until we move to moz-central, when we're going to need a new system anyways.
1 parent ff55284 commit 1f73e45

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/workflows/dependency-check.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ jobs:
5555
export PATH="$HOME/.cargo/bin:$PATH"
5656
source $HOME/.cargo/env
5757
rustup toolchain install
58-
# Needed because `tools/dependency_summary.py` uses nightly
59-
rustup toolchain install nightly
6058
- name: Run Cargo Audit
6159
run: |
6260
cargo install cargo-audit --locked

tools/dependency_summary.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -995,11 +995,7 @@
995995

996996
def subprocess_run_cargo(args):
997997
"""Run `cargo` as a subprocess, returning stdout."""
998-
# This script needs to use the `--build-plan` option, hence require cargo nightly.
999-
# By using $RUSTUP_TOOLCHAIN to specify this, we can cause rustup to helpfully
1000-
# download and install the nightly toolchain if it's not already available.
1001998
env = os.environ.copy()
1002-
env["RUSTUP_TOOLCHAIN"] = "nightly"
1003999
p = subprocess.run(
10041000
("cargo",) + args,
10051001
env=env,
@@ -1096,6 +1092,9 @@ def get_package_dependencies(self, name, targets=None):
10961092
"""
10971093
targets = self.get_compatible_targets_for_package(name, targets)
10981094
cargo_args = (
1095+
# last nightly that supported --build-plan, details:
1096+
# https://github.com/rust-lang/cargo/issues/7614
1097+
"+nightly-2025-11-08",
10991098
"-Z",
11001099
"unstable-options",
11011100
"build",

0 commit comments

Comments
 (0)