Fix CI for nightly toolchain

arceos-org · Apr 25, 2024 · 8c4aefb · 8c4aefb
1 parent 1d05532
commit 8c4aefb
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 42 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,15 +7,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix: 
+      matrix:
         rust-toolchain: [nightly, nightly-2024-01-19]
+    env:
+      RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        profile: minimal
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, clippy, rustfmt
+        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat
+    - name: Check rust version
+      run: rustc --version --verbose
     - name: Clippy for the default target
       run: make clippy
     - name: Clippy for x86_64
@@ -35,18 +39,17 @@ jobs:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64]
         rust-toolchain: [nightly, nightly-2024-01-19]
+    env:
+      RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        profile: minimal
         toolchain: ${{ matrix.rust-toolchain }}
-        components: rust-src
-    - uses: actions-rs/[email protected]
-      with:
-        crate: cargo-binutils
-        version: latest
-        use-tool-cache: true
+        components: rust-src, llvm-tools
+        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat
+    - uses: Swatinem/rust-cache@v2
+    - run: cargo install cargo-binutils
     - name: Build helloworld
       run: make ARCH=${{ matrix.arch }} A=apps/helloworld
     - name: Build memtest
@@ -103,18 +106,17 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         rust-toolchain: [nightly, nightly-2024-01-19]
+    env:
+      RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        profile: minimal
         toolchain: ${{ matrix.rust-toolchain }}
-        components: rust-src
-    - uses: actions-rs/[email protected]
-      with:
-        crate: cargo-binutils
-        version: latest
-        use-tool-cache: true
+        components: rust-src, llvm-tools
+        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat
+    - uses: Swatinem/rust-cache@v2
+    - run: cargo install cargo-binutils
     - uses: ./.github/workflows/actions/setup-musl
       with:
         arch: x86_64
@@ -144,11 +146,12 @@ jobs:
         os: [ubuntu-latest]
         arch: [x86_64]
         rust-toolchain: [nightly, nightly-2024-01-19]
+    env:
+      RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        profile: minimal
         toolchain: ${{ matrix.rust-toolchain }}
     - name: Build helloworld
       run: cargo build -p arceos-helloworld

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -15,11 +15,10 @@ jobs:
     env:
       default-branch: ${{ format('refs/heads/{0}', github.event.repository.default_branch) }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        profile: minimal
-        toolchain: ${{ env.rust-toolchain }}
+        toolchain: ${{ matrix.rust-toolchain }}
     - name: Build docs
       continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
       run: make doc_check_missing

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,11 +10,10 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        profile: minimal
-        toolchain: ${{ env.rust-toolchain }}
+        toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src
     - name: Run unit tests
       run: make unittest_no_fail_fast
@@ -27,17 +26,13 @@ jobs:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        profile: minimal
-        toolchain: ${{ env.rust-toolchain }}
+        toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src
-    - uses: actions-rs/[email protected]
-      with:
-        crate: cargo-binutils
-        version: latest
-        use-tool-cache: true
+    - uses: Swatinem/rust-cache@v2
+    - run: cargo install cargo-binutils
     - uses: ./.github/workflows/actions/setup-qemu
       with:
         qemu-version: ${{ env.qemu-version }}