Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setup ci so that most checks run in merge queue only #1368

Merged
merged 2 commits into from
Mar 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion .github/workflows/merge-check.yml → .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
on:
pull_request:
merge_group:

name: Merge Queue Check
name: Continuous integration

env:
CARGO_TERM_COLOR: always
Expand All @@ -10,7 +11,22 @@ env:
RUSTFLAGS: "-D warnings"

jobs:
clippy:
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- beta
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
components: clippy
- uses: Swatinem/rust-cache@v2
- run: cargo clippy --features docs
tests:
if: ${{ github.event_name == 'merge_group' }}
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -20,6 +36,7 @@ jobs:
- nightly
- 1.51.0 # MSRV

name: tests/${{ matrix.rust }}
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand All @@ -31,6 +48,7 @@ jobs:
- run: ./scripts/all-tests.sh "$FEATURES" ${{ matrix.rust }}

cross_test:
if: ${{ github.event_name == 'merge_group' }}
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -40,6 +58,7 @@ jobs:
- rust: stable
target: i686-unknown-linux-gnu

name: cross_test/${{ matrix.target }}/${{ matrix.rust }}
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand All @@ -50,3 +69,19 @@ jobs:
- name: Install cross
run: cargo install cross
- run: ./scripts/cross-tests.sh "docs" ${{ matrix.rust }} ${{ matrix.target }}

conclusion:
needs:
- clippy
- tests
- cross_test
if: always()
runs-on: ubuntu-latest
steps:
- name: Result
run: |
jq -C <<< "${needs}"
# Check if all needs were successful or skipped.
"$(jq -r 'all(.result as $result | (["success", "skipped"] | contains([$result])))' <<< "${needs}")"
env:
needs: ${{ toJson(needs) }}
25 changes: 0 additions & 25 deletions .github/workflows/pr-check.yml

This file was deleted.