Merge #52

52: Update and simplify the CI workflow r=cuviper a=cuviper - Update to actions/checkout@v3 - Switch from actions-rs/toolchain to dtolnay/rust-toolchain - Switch from actions-rs/cargo to plain run - Stop explicitly naming CI steps Co-authored-by: Josh Stone <cuviper@gmail.com>
rust-num · Jul 14, 2022 · c259ebc · c259ebc
2 parents 61a6e52 + 9beade3
commit c259ebc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 74 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,58 +14,32 @@ jobs:
       matrix:
         rust: [1.31.0, stable, beta, nightly]
     steps:
-      - name: Rust install
-        uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-      - name: Test
-        run: ./ci/test_full.sh
+      - run: cargo build
+      - run: ./ci/test_full.sh
 
   # try a target that doesn't have std at all
   no_std:
     name: No Std
     runs-on: ubuntu-latest
     steps:
-      - name: Rust install
-        uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          profile: minimal
-          override: true
           target: thumbv6m-none-eabi
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          # This test crate is intentionally separate, because we need
-          # independent features for no-std. (rust-lang/cargo#2589)
-          args: --target thumbv6m-none-eabi --manifest-path ci/check/Cargo.toml
+      - run: cargo build --target thumbv6m-none-eabi --manifest-path ci/check/Cargo.toml
+        # This test crate is intentionally separate, because we need
+        # independent features for no-std. (rust-lang/cargo#2589)
 
   fmt:
     name: Format
     runs-on: ubuntu-latest
     steps:
-      - name: Rust install
-        uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@1.62.0
         with:
-          toolchain: 1.42.0
-          profile: minimal
-          override: true
           components: rustfmt
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+      - run: cargo fmt --all --check
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -15,17 +15,9 @@ jobs:
       matrix:
         rust: [1.31.0, stable]
     steps:
-      - name: Rust install
-        uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-      - name: Test
-        run: ./ci/test_full.sh
+      - run: cargo build
+      - run: ./ci/test_full.sh
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -11,36 +11,19 @@ jobs:
       matrix:
         rust: [1.31.0, stable]
     steps:
-      - name: Rust install
-        uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-      - name: Test
-        run: ./ci/test_full.sh
+      - run: cargo build
+      - run: ./ci/test_full.sh
 
   fmt:
     name: Format
     runs-on: ubuntu-latest
     steps:
-      - name: Rust install
-        uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@1.62.0
         with:
-          toolchain: 1.42.0
-          profile: minimal
-          override: true
           components: rustfmt
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+      - run: cargo fmt --all --check