Merge pull request #531 from Xynnn007/fix-ci

Ci: Install Rust via `actions-rust-lang/setup-rust-toolchain@v1` rather than `rustup`
confidential-containers · Oct 16, 2024 · e52be89 · e52be89
2 parents 2e4e7b5 + b3bf5fd
commit e52be89
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/as-e2e.yml b/.github/workflows/as-e2e.yml
@@ -35,10 +35,10 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
-      run: |
-        rustup update --no-self-update ${{ env.RUSTC_VERSION }}
-        rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustc
-        rustup default ${{ env.RUSTC_VERSION }}
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ env.RUSTC_VERSION }}
+        components: rustfmt, clippy
 
     - uses: actions/setup-go@v5
       with:

diff --git a/.github/workflows/as-rust.yml b/.github/workflows/as-rust.yml
@@ -58,10 +58,10 @@ jobs:
           sudo apt-get install -y libsgx-dcap-quote-verify-dev libsgx-dcap-default-qpl
 
       - name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
-        run: |
-          rustup update --no-self-update ${{ env.RUSTC_VERSION }}
-          rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustfmt rustc clippy
-          rustup default ${{ env.RUSTC_VERSION }}
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ env.RUSTC_VERSION }}
+          components: rustfmt, clippy
 
       - name: Build
         working-directory: attestation-service

diff --git a/.github/workflows/kbs-docker-e2e.yml b/.github/workflows/kbs-docker-e2e.yml
@@ -19,10 +19,10 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install Rust ${{ env.RUSTC_VERSION }} (for client)
-      run: |
-        rustup update --no-self-update ${{ env.RUSTC_VERSION }}
-        rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustc
-        rustup default ${{ env.RUSTC_VERSION }}
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ env.RUSTC_VERSION }}
+        components: rustfmt, clippy
 
     - name: Build client
       run: |

diff --git a/.github/workflows/kbs-e2e.yml b/.github/workflows/kbs-e2e.yml
@@ -33,10 +33,11 @@ jobs:
       run: tar xzf ./artifact/${{ inputs.tarball }}
 
     - name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
-      run: |
-        rustup update --no-self-update ${{ env.RUSTC_VERSION }}
-        rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustc
-        rustup default ${{ env.RUSTC_VERSION }}
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ env.RUSTC_VERSION }}
+        components: rustfmt, clippy
+        rustflags: ""
 
     - name: Set up rust build cache
       uses: actions/cache@v4

diff --git a/.github/workflows/kbs-rust.yml b/.github/workflows/kbs-rust.yml
@@ -31,11 +31,10 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
-      run: |
-        rustup update --no-self-update ${{ env.RUSTC_VERSION }}
-        rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustfmt rustc clippy
-        rustup target add x86_64-unknown-linux-gnu
-        rustup default ${{ env.RUSTC_VERSION }}
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ env.RUSTC_VERSION }}
+        components: rustfmt, clippy
 
     - name: Building dependencies installation
       run: |

diff --git a/.github/workflows/push-kbs-client-to-ghcr.yml b/.github/workflows/push-kbs-client-to-ghcr.yml
@@ -25,10 +25,10 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install Rust toolchain (${{ env.RUSTC_VERSION }})
-      run: |
-        rustup update --no-self-update ${{ env.RUSTC_VERSION }}
-        rustup component add --toolchain ${{ env.RUSTC_VERSION }} rustc
-        rustup default ${{ env.RUSTC_VERSION }}
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ env.RUSTC_VERSION }}
+        components: rustfmt, clippy
 
     - name: Log in to ghcr.io
       uses: docker/login-action@v3