From 782b9be099afab63806dc13a0e8b13948414b319 Mon Sep 17 00:00:00 2001 From: Joining7943 <111500881+Joining7943@users.noreply.github.com> Date: Mon, 6 Feb 2023 15:52:29 +0100 Subject: [PATCH] cicd: Fix #4322 toochain overrides must begin with +. Do not self-update rustup. --- .github/workflows/CICD.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 6f61cf6d1..9c2faa0f4 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -1,11 +1,11 @@ name: CICD -# spell-checker:ignore (abbrev/names) CICD CodeCOV MacOS MinGW MSVC musl +# spell-checker:ignore (abbrev/names) CICD CodeCOV MacOS MinGW MSVC musl # spell-checker:ignore (env/flags) Awarnings Ccodegen Coverflow Cpanic Dwarnings RUSTDOCFLAGS RUSTFLAGS Zpanic # spell-checker:ignore (jargon) SHAs deps dequote softprops subshell toolchain # spell-checker:ignore (people) Peltoche rivy # spell-checker:ignore (shell/tools) choco clippy dmake dpkg esac fakeroot fdesc fdescfs gmake grcov halium lcov libssl mkdir popd printf pushd rsync rustc rustfmt rustup shopt utmpdump xargs -# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos gnueabihf issuecomment maint multisize nullglob onexitbegin onexitend pell runtest Swatinem tempfile testsuite toybox uutils +# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos gnueabihf issuecomment maint multisize nullglob onexitbegin onexitend pell runtest Swatinem tempfile testsuite toybox uutils env: PROJECT_NAME: coreutils @@ -66,7 +66,7 @@ jobs: ## * ... ref: - name: Install `rust` toolchain run: | - rustup toolchain install nightly --profile minimal + rustup toolchain install nightly --no-self-update --profile minimal rustup default nightly - uses: Swatinem/rust-cache@v2 - name: Install `cargo-udeps` @@ -117,8 +117,7 @@ jobs: - name: Install `rust` toolchain run: | ## Install `rust` toolchain - rm -f "${HOME}/.cargo/bin/"{rustfmt,cargo-fmt} - rustup toolchain install stable -c rustfmt --profile minimal + rustup toolchain install stable --no-self-update -c rustfmt --profile minimal rustup default stable - uses: Swatinem/rust-cache@v2 - name: "`cargo fmt` testing" @@ -178,7 +177,7 @@ jobs: - name: Install `rust` toolchain run: | ## Install `rust` toolchain - rustup toolchain install stable -c clippy --profile minimal + rustup toolchain install stable --no-self-update -c clippy --profile minimal rustup default stable - uses: Swatinem/rust-cache@v2 - name: "`cargo clippy` lint testing" @@ -280,7 +279,7 @@ jobs: - name: Install `rust` toolchain run: | ## Install `rust` toolchain - rustup toolchain install stable -c clippy --profile minimal + rustup toolchain install stable --no-self-update -c clippy --profile minimal rustup default stable - uses: Swatinem/rust-cache@v2 - name: "`cargo doc` with warnings" @@ -312,7 +311,7 @@ jobs: - name: Install `rust` toolchain (v${{ env.RUST_MIN_SRV }}) run: | ## Install `rust` toolchain (v${{ env.RUST_MIN_SRV }}) - rustup toolchain install ${{ env.RUST_MIN_SRV }} --profile minimal + rustup toolchain install --no-self-update ${{ env.RUST_MIN_SRV }} --profile minimal rustup default ${{ env.RUST_MIN_SRV }} - uses: Swatinem/rust-cache@v2 - name: Confirm MinSRV compatible 'Cargo.lock' @@ -367,7 +366,7 @@ jobs: - name: Install `rust` toolchain run: | ## Install `rust` toolchain - rustup toolchain install stable --profile minimal + rustup toolchain install stable --no-self-update --profile minimal rustup default stable - uses: Swatinem/rust-cache@v2 - name: "`cargo update` testing" @@ -391,7 +390,7 @@ jobs: - name: Install `rust` toolchain run: | ## Install `rust` toolchain - rustup toolchain install stable --profile minimal + rustup toolchain install stable --no-self-update --profile minimal rustup default stable - uses: Swatinem/rust-cache@v2 - name: "`make build`" @@ -423,7 +422,7 @@ jobs: - name: Install `rust` toolchain run: | ## Install `rust` toolchain - rustup toolchain install stable --profile minimal + rustup toolchain install stable --no-self-update --profile minimal rustup default stable - uses: Swatinem/rust-cache@v2 - name: Test @@ -448,7 +447,7 @@ jobs: - name: Install `rust` toolchain run: | ## Install `rust` toolchain - rustup toolchain install nightly --profile minimal + rustup toolchain install nightly --no-self-update --profile minimal rustup default nightly - uses: Swatinem/rust-cache@v2 - name: Test @@ -476,7 +475,7 @@ jobs: - name: Install `rust` toolchain run: | ## Install `rust` toolchain - rustup toolchain install stable --profile minimal + rustup toolchain install stable --no-self-update --profile minimal rustup default stable - uses: Swatinem/rust-cache@v2 - name: "`make install`" @@ -665,7 +664,7 @@ jobs: - name: rust toolchain ~ install run: | ## rust toolchain ~ install - rustup toolchain install ${{ env.RUST_MIN_SRV }} -t ${{ matrix.job.target }} --profile minimal + rustup toolchain install --no-self-update ${{ env.RUST_MIN_SRV }} -t ${{ matrix.job.target }} --profile minimal rustup default ${{ env.RUST_MIN_SRV }} - uses: Swatinem/rust-cache@v2 with: @@ -871,7 +870,7 @@ jobs: - name: rust toolchain ~ install run: | ## rust toolchain ~ install - rustup toolchain install ${{ env.RUST_MIN_SRV }} --profile minimal + rustup toolchain install --no-self-update ${{ env.RUST_MIN_SRV }} --profile minimal rustup default ${{ env.RUST_MIN_SRV }} - name: Build coreutils as multiple binaries shell: bash @@ -1127,7 +1126,7 @@ jobs: - name: rust toolchain ~ install run: | ## rust toolchain ~ install - rustup toolchain install ${{ steps.vars.outputs.TOOLCHAIN }} --profile minimal + rustup toolchain install ${{ steps.vars.outputs.TOOLCHAIN }} --no-self-update --profile minimal rustup default ${{ steps.vars.outputs.TOOLCHAIN }} - uses: Swatinem/rust-cache@v2 - name: Initialize toolchain-dependent workflow variables