diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index 68e172ad..00000000 --- a/.github/bors.toml +++ /dev/null @@ -1,10 +0,0 @@ -block_labels = ["needs-decision"] -delete_merged_branches = true -required_approvals = 1 -status = [ - "CI (stable, x86_64-unknown-linux-gnu)", - "CI (stable, armv7-unknown-linux-gnueabihf)", - "CI (1.60.0, x86_64-unknown-linux-gnu)", - "CI-macOS (stable, x86_64-apple-darwin)", - "CI-macOS (1.60.0, x86_64-apple-darwin)", -] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 185498c7..44635006 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: CI diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 72d9a109..f2c654ac 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -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: diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml index 9a55c002..de591564 100644 --- a/.github/workflows/rustfmt.yml +++ b/.github/workflows/rustfmt.yml @@ -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