ci: use stable Rust for all clippy lints

cuiyourong · Mar 19, 2024 · 130107d · 130107d
1 parent bb18f10
commit 130107d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1215,18 +1215,7 @@ jobs:
           restore-keys: ${{ github.base_ref }}-${{ runner.os }}-cargo-clippy-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
       - name: Install Rustup using ./rustup-init.sh
         run: |
-          sh ./rustup-init.sh --default-toolchain=none --profile=minimal -y
-      - name: Ensure Beta is up to date
-        run: |
-          if rustc +beta -vV >/dev/null 2>/dev/null; then
-            rustup toolchain uninstall beta
-          fi
-          rustup toolchain install --profile=minimal beta
-          rustup default beta
-      - name: Ensure we have the components we need
-        run: |
-          rustup component add rustfmt
-          rustup component add clippy
+          sh ./rustup-init.sh --default-toolchain=stable --profile=minimal -c=rustfmt -c=clippy -y
       - name: Run the centos check within the docker image
         run: |
           docker run \

diff --git a/ci/actions-templates/centos-fmt-clippy-template.yaml b/ci/actions-templates/centos-fmt-clippy-template.yaml
@@ -49,18 +49,7 @@ jobs: # skip-all
           restore-keys: ${{ github.base_ref }}-${{ runner.os }}-cargo-clippy-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
       - name: Install Rustup using ./rustup-init.sh
         run: |
-          sh ./rustup-init.sh --default-toolchain=none --profile=minimal -y
-      - name: Ensure Beta is up to date
-        run: |
-          if rustc +beta -vV >/dev/null 2>/dev/null; then
-            rustup toolchain uninstall beta
-          fi
-          rustup toolchain install --profile=minimal beta
-          rustup default beta
-      - name: Ensure we have the components we need
-        run: |
-          rustup component add rustfmt
-          rustup component add clippy
+          sh ./rustup-init.sh --default-toolchain=stable --profile=minimal -c=rustfmt -c=clippy -y
       - name: Run the centos check within the docker image
         run: |
           docker run \