Skip to content

Commit

Permalink
Merge pull request #25 from cuviper/ci-merge
Browse files Browse the repository at this point in the history
Switch from bors to merge queues
  • Loading branch information
cuviper authored Feb 1, 2024
2 parents 4b09fc1 + 5518b59 commit e582ad4
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 20 deletions.
26 changes: 18 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: CI
on:
push:
branches:
- staging
- trying
on: merge_group

jobs:

Expand All @@ -14,7 +10,7 @@ jobs:
matrix:
rust: [1.31.0, stable, beta, nightly]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
Expand All @@ -26,7 +22,7 @@ jobs:
name: No Std
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
target: thumbv6m-none-eabi
Expand All @@ -36,8 +32,22 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/[email protected]
with:
components: rustfmt
- run: cargo fmt --all --check

ci-success:
name: Complete
runs-on: ubuntu-latest
needs: [test, no_std, fmt]
steps:
- run: exit 0
ci-failed:
name: Complete
runs-on: ubuntu-latest
needs: [test, no_std, fmt]
if: failure()
steps:
- run: exit 1
2 changes: 1 addition & 1 deletion .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
rust: [1.31.0, stable]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
Expand Down
18 changes: 16 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
rust: [1.31.0, stable]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
Expand All @@ -22,8 +22,22 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/[email protected]
with:
components: rustfmt
- run: cargo fmt --all --check

ci-success:
name: Complete
runs-on: ubuntu-latest
needs: [test, fmt]
steps:
- run: exit 0
ci-failed:
name: Complete
runs-on: ubuntu-latest
needs: [test, fmt]
if: failure()
steps:
- run: exit 1
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repository = "https://github.com/rust-num/num-iter"
name = "num-iter"
version = "0.1.43"
readme = "README.md"
exclude = ["/bors.toml", "/ci/*", "/.github/*"]
exclude = ["/ci/*", "/.github/*"]
edition = "2018"
rust-version = "1.31"

Expand Down
8 changes: 0 additions & 8 deletions bors.toml

This file was deleted.

0 comments on commit e582ad4

Please sign in to comment.