Skip to content

Commit

Permalink
Merge pull request #55 from cuviper/farewell-bors
Browse files Browse the repository at this point in the history
Update CI without bors
  • Loading branch information
cuviper authored Mar 25, 2024
2 parents e75324c + 8717f69 commit 5e07f6a
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 82 deletions.
32 changes: 24 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: CI
on:
pull_request:
push:
branches:
- staging
- trying
- master

jobs:

Expand All @@ -13,9 +13,10 @@ jobs:
strategy:
matrix:
rust: [1.0.0, 1.5.0, 1.10.0, 1.15.0, 1.20.0, 1.25.0, 1.30.0, 1.35.0,
1.40.0, 1.45.0, 1.50.0, 1.55.0, 1.60.0, stable, beta, nightly]
1.40.0, 1.45.0, 1.50.0, 1.55.0, 1.60.0, 1.65.0, 1.70.0, 1.75.0,
stable, beta, nightly]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
Expand All @@ -27,7 +28,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 @@ -40,7 +41,7 @@ jobs:
name: Missing Target
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- run: cargo test --verbose --lib -- version
env:
Expand All @@ -50,8 +51,23 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.62.0
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.77.0
with:
components: rustfmt
- run: cargo fmt --all --check

# One job that "summarizes" the success state of this pipeline. This can then be added to branch
# protection, rather than having to add each job separately.
success:
name: Success
runs-on: ubuntu-latest
needs: [test, no_std, missing_target, fmt]
# Github branch protection is exceedingly silly and treats "jobs skipped because a dependency
# failed" as success. So we have to do some contortions to ensure the job fails if any of its
# dependencies fails.
if: always() # make sure this is never "skipped"
steps:
# Manually check the status of all dependencies. `if: failure()` does not work.
- name: check if any dependency failed
run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
23 changes: 0 additions & 23 deletions .github/workflows/master.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/workflows/pr.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ description = "Automatic cfg for Rust compiler features"
readme = "README.md"
keywords = ["rustc", "build", "autoconf"]
categories = ["development-tools::build-utils"]
exclude = ["/.github/**", "/bors.toml"]
exclude = ["/.github/**"]
rust-version = "1.0"

[dependencies]
21 changes: 0 additions & 21 deletions bors.toml

This file was deleted.

0 comments on commit 5e07f6a

Please sign in to comment.