From f091362bd53cdccbc67beb95b26e60f912242659 Mon Sep 17 00:00:00 2001 From: xtqqczze <45661989+xtqqczze@users.noreply.github.com> Date: Fri, 30 Jan 2026 23:13:53 +0000 Subject: [PATCH] ci: use toolchain override shorthand --- .github/workflows/CICD.yml | 6 +++--- .github/workflows/FixPR.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index c76126461..9e336c7c3 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -221,8 +221,8 @@ jobs: # dependencies echo "## dependency list" ## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors - RUSTUP_TOOLCHAIN=stable cargo fetch --locked --quiet --target $(rustc --print host-tuple) - RUSTUP_TOOLCHAIN=stable cargo tree --no-dedupe --locked -e=no-dev --prefix=none ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} | grep -vE "$PWD" | sort --unique + cargo +stable fetch --locked --quiet --target $(rustc --print host-tuple) + cargo +stable tree --no-dedupe --locked -e=no-dev --prefix=none ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} | grep -vE "$PWD" | sort --unique - name: Test run: cargo nextest run --hide-progress-bar --profile ci ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} -p uucore -p coreutils env: @@ -1225,7 +1225,7 @@ jobs: fail_ci_if_error: false test_separately: - name: Separate Builds (individual and coreutils)# duplicated with other CI, but has better appearance + name: Separate Builds (individual and coreutils)# duplicated with other CI, but has better appearance runs-on: ${{ matrix.job.os }} strategy: fail-fast: false diff --git a/.github/workflows/FixPR.yml b/.github/workflows/FixPR.yml index 70f42278c..d086687e8 100644 --- a/.github/workflows/FixPR.yml +++ b/.github/workflows/FixPR.yml @@ -67,7 +67,7 @@ jobs: echo "## dependency list" cargo fetch --locked --quiet --target $(rustc --print host-tuple) ## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors - RUSTUP_TOOLCHAIN=stable cargo tree --locked --no-dedupe -e=no-dev --prefix=none --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique + cargo +stable tree --locked --no-dedupe -e=no-dev --prefix=none --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique - name: Commit any changes (to '${{ env.BRANCH_TARGET }}') uses: EndBug/add-and-commit@v9 with: