Skip to content

Commit

Permalink
Merge pull request #464 from eldruin/switch-to-ghmq
Browse files Browse the repository at this point in the history
Prepare switch to GHMQ
  • Loading branch information
Dirbaio authored Jun 20, 2023
2 parents 7e24e0c + 50cceac commit 3620083
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 26 deletions.
16 changes: 0 additions & 16 deletions .github/bors.toml

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:
push: # Run CI for all branches except GitHub merge queue tmp branches
branches-ignore:
- "gh-readonly-queue/**"
pull_request: # Run CI for PRs on any branch
merge_group: # Run CI for the GitHub merge queue

name: Clippy check
jobs:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/rustfmt.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:
push: # Run CI for all branches except GitHub merge queue tmp branches
branches-ignore:
- "gh-readonly-queue/**"
pull_request: # Run CI for PRs on any branch
merge_group: # Run CI for the GitHub merge queue

name: Code formatting check

Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:
push: # Run CI for all branches except GitHub merge queue tmp branches
branches-ignore:
- "gh-readonly-queue/**"
pull_request: # Run CI for PRs on any branch
merge_group: # Run CI for the GitHub merge queue

name: Continuous integration

Expand Down Expand Up @@ -32,7 +34,7 @@ jobs:
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}

- run: sed -i '/nightly-only/d' Cargo.toml
- run: sed -i '/nightly-only/d' Cargo.toml
if: matrix.rust != 'nightly'

- run: cargo check --target=${{ matrix.target }} --features=${{ matrix.features }}
Expand Down

0 comments on commit 3620083

Please sign in to comment.