Skip to content

Commit 3620083

Browse files
authored
Merge pull request #464 from eldruin/switch-to-ghmq
Prepare switch to GHMQ
2 parents 7e24e0c + 50cceac commit 3620083

File tree

4 files changed

+16
-26
lines changed

4 files changed

+16
-26
lines changed

.github/bors.toml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/clippy.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Clippy check
79
jobs:

.github/workflows/rustfmt.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Code formatting check
79

.github/workflows/test.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
on:
2-
push:
3-
branches: [ staging, trying, master ]
4-
pull_request:
2+
push: # Run CI for all branches except GitHub merge queue tmp branches
3+
branches-ignore:
4+
- "gh-readonly-queue/**"
5+
pull_request: # Run CI for PRs on any branch
6+
merge_group: # Run CI for the GitHub merge queue
57

68
name: Continuous integration
79

@@ -32,7 +34,7 @@ jobs:
3234
toolchain: ${{ matrix.rust }}
3335
target: ${{ matrix.target }}
3436

35-
- run: sed -i '/nightly-only/d' Cargo.toml
37+
- run: sed -i '/nightly-only/d' Cargo.toml
3638
if: matrix.rust != 'nightly'
3739

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

0 commit comments

Comments
 (0)