From 11cb9f4356a662c36d19c4dd625010c19bcfc688 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Fri, 10 Apr 2026 11:01:12 +0100 Subject: [PATCH] ci: Do not install cargo machete by building it (#53607) Re-building the tool on CI every time is pointless when can just install the binary itself Release Notes: - N/A or Added/Fixed/Improved ... --- .github/workflows/autofix_pr.yml | 5 ++--- .github/workflows/run_tests.yml | 9 +++------ .../xtask/src/tasks/workflows/autofix_pr.rs | 9 ++++----- tooling/xtask/src/tasks/workflows/run_tests.rs | 18 ++++++------------ 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/.github/workflows/autofix_pr.yml b/.github/workflows/autofix_pr.yml index 717c5e2fa5..4c0b4ac378 100644 --- a/.github/workflows/autofix_pr.yml +++ b/.github/workflows/autofix_pr.yml @@ -45,10 +45,9 @@ jobs: version: '9' - name: autofix_pr::run_autofix::install_cargo_machete if: ${{ inputs.run_clippy }} - uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 + uses: taiki-e/install-action@02cc5f8ca9f2301050c0c099055816a41ee05507 with: - command: install - args: cargo-machete@0.7.0 + tool: cargo-machete@0.7.0 - name: autofix_pr::run_autofix::run_cargo_fix if: ${{ inputs.run_clippy }} run: cargo fix --workspace --release --all-targets --all-features --allow-dirty --allow-staged diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index a1e15e7beb..c9e8355495 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -618,14 +618,11 @@ jobs: cache: rust path: ~/.rustup - name: run_tests::check_dependencies::install_cargo_machete - uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 + uses: taiki-e/install-action@02cc5f8ca9f2301050c0c099055816a41ee05507 with: - command: install - args: cargo-machete@0.7.0 + tool: cargo-machete@0.7.0 - name: run_tests::check_dependencies::run_cargo_machete - uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 - with: - command: machete + run: cargo machete - name: run_tests::check_dependencies::check_cargo_lock run: cargo update --locked --workspace - name: run_tests::check_dependencies::check_vulnerable_dependencies diff --git a/tooling/xtask/src/tasks/workflows/autofix_pr.rs b/tooling/xtask/src/tasks/workflows/autofix_pr.rs index 6fa7743275..400103b55e 100644 --- a/tooling/xtask/src/tasks/workflows/autofix_pr.rs +++ b/tooling/xtask/src/tasks/workflows/autofix_pr.rs @@ -62,12 +62,11 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo fn install_cargo_machete() -> Step { named::uses( - "clechasseur", - "rs-cargo", - "8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386", // v2 + "taiki-e", + "install-action", + "02cc5f8ca9f2301050c0c099055816a41ee05507", ) - .add_with(("command", "install")) - .add_with(("args", "cargo-machete@0.7.0")) + .add_with(("tool", "cargo-machete@0.7.0")) } fn run_cargo_fmt() -> Step { diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs index b8d6e06360..f51b21b961 100644 --- a/tooling/xtask/src/tasks/workflows/run_tests.rs +++ b/tooling/xtask/src/tasks/workflows/run_tests.rs @@ -408,21 +408,15 @@ fn check_style() -> NamedJob { fn check_dependencies() -> NamedJob { fn install_cargo_machete() -> Step { named::uses( - "clechasseur", - "rs-cargo", - "8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386", // v2 + "taiki-e", + "install-action", + "02cc5f8ca9f2301050c0c099055816a41ee05507", ) - .add_with(("command", "install")) - .add_with(("args", "cargo-machete@0.7.0")) + .add_with(("tool", "cargo-machete@0.7.0")) } - fn run_cargo_machete() -> Step { - named::uses( - "clechasseur", - "rs-cargo", - "8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386", // v2 - ) - .add_with(("command", "machete")) + fn run_cargo_machete() -> Step { + named::bash("cargo machete") } fn check_cargo_lock() -> Step {