Skip to content
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
23 changes: 2 additions & 21 deletions .github/workflows/ci.yml → .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
merge_group:

name: Continuous integration
name: Merge Queue Check

env:
CARGO_TERM_COLOR: always
Expand Down Expand Up @@ -35,7 +32,6 @@ jobs:

cross_test:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
strategy:
matrix:
include:
Expand All @@ -54,18 +50,3 @@ jobs:
- name: Install cross
run: cargo install cross
- run: ./scripts/cross-tests.sh "docs" ${{ matrix.rust }} ${{ matrix.target }}

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
25 changes: 25 additions & 0 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
on:
pull_request:
merge_group:

name: PR Check

env:
CARGO_TERM_COLOR: always
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