Skip to content

Commit

Permalink
Stop explicitly naming CI steps
Browse files Browse the repository at this point in the history
  • Loading branch information
cuviper committed Jul 14, 2022
1 parent 521b881 commit 9beade3
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 42 deletions.
30 changes: 10 additions & 20 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,32 @@ jobs:
matrix:
rust: [1.31.0, stable, beta, nightly]
steps:
- name: Rust install
uses: dtolnay/rust-toolchain@master
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
- name: Checkout
uses: actions/checkout@v3
- name: Build
run: cargo 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: dtolnay/rust-toolchain@stable
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
target: thumbv6m-none-eabi
- name: Checkout
uses: actions/checkout@v3
- name: Build
run: cargo build --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: dtolnay/[email protected]
- uses: actions/checkout@v3
- uses: dtolnay/[email protected]
with:
components: rustfmt
- name: Checkout
uses: actions/checkout@v3
- name: Check formatting
run: cargo fmt --all --check
- run: cargo fmt --all --check
12 changes: 4 additions & 8 deletions .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@ jobs:
matrix:
rust: [1.31.0, stable]
steps:
- name: Rust install
uses: dtolnay/rust-toolchain@master
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
- name: Checkout
uses: actions/checkout@v3
- name: Build
run: cargo build
- name: Test
run: ./ci/test_full.sh
- run: cargo build
- run: ./ci/test_full.sh
21 changes: 7 additions & 14 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,19 @@ jobs:
matrix:
rust: [1.31.0, stable]
steps:
- name: Rust install
uses: dtolnay/rust-toolchain@master
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
- name: Checkout
uses: actions/checkout@v3
- name: Build
run: cargo 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: dtolnay/[email protected]
- uses: actions/checkout@v3
- uses: dtolnay/[email protected]
with:
components: rustfmt
- name: Checkout
uses: actions/checkout@v3
- name: Check formatting
run: cargo fmt --all --check
- run: cargo fmt --all --check

0 comments on commit 9beade3

Please sign in to comment.