use actions-rust-lang/setup-rust-toolchain to setup rust and cargo

yaa110 · Dec 1, 2024 · 838ae52 · 838ae52
1 parent 09c178c
commit 838ae52
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 41 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,11 +23,8 @@ jobs:
     needs: [release]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          default: true
-      - run: cargo build --release -j`nproc`
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - run: cargo build --release
       - run: |
           mv target/release/nomino nomino-linux-64bit
           gh release upload "v${{ github.ref_name }}" nomino-linux-64bit --clobber
@@ -41,11 +38,8 @@ jobs:
     needs: [release]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          default: true
-      - run: cargo build --release -j`sysctl -n hw.physicalcpu`
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - run: cargo build --release
       - run: |
           mv target/release/nomino nomino-macos-64bit
           gh release upload "v${{ github.ref_name }}" nomino-macos-64bit --clobber
@@ -59,10 +53,7 @@ jobs:
     needs: [release]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          default: true
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
       - run: cargo build --release
       - run: |
           mv target/release/nomino.exe nomino-windows-64bit.exe

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,40 +11,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          default: true
-          toolchain: stable
           components: rustfmt, clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: -- --check
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
+      - run: cargo test
+      - run: cargo fmt -- --check
+      - run: cargo clippy
   macos:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          default: true
-          toolchain: stable
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - run: cargo test
   windows:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          default: true
-          toolchain: stable
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - run: cargo test