From e9847bc431b20f309cc75e036721d5495f121725 Mon Sep 17 00:00:00 2001 From: Adam Greig Date: Tue, 11 Jul 2023 23:54:36 +0100 Subject: [PATCH] Swap to GHMQ --- .github/bors.toml | 15 --------------- .github/workflows/ci.yml | 4 +++- .github/workflows/clippy.yml | 4 +++- .github/workflows/on-target.yml | 4 +++- .github/workflows/rt-ci.yml | 4 +++- .github/workflows/rustfmt.yml | 4 +++- 6 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 .github/bors.toml diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index 17cef85c..00000000 --- a/.github/bors.toml +++ /dev/null @@ -1,15 +0,0 @@ -block_labels = ["needs-decision"] -delete_merged_branches = true -required_approvals = 1 -status = [ - "ci-linux (stable)", - "ci-linux (1.59.0)", - "rt-ci-linux (stable)", - "rt-ci-linux (1.59.0)", - "rt-ci-other-os (macOS-latest)", - "rt-ci-other-os (windows-latest)", - "hil-qemu", - "hil-compile-rtt", - "rustfmt", - "clippy", -] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d9b2b46..16456af2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,9 @@ on: push: - branches: [ staging, trying, master ] + branches-ignore: + - "gh-readonly-queue/**" pull_request: + merge_group: name: cortex-m CI diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index ecfd0b98..9ae8db40 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -1,7 +1,9 @@ on: push: - branches: [ staging, trying, master ] + branches-ignore: + - "gh-readonly-queue/**" pull_request_target: + merge_group: name: Clippy check jobs: diff --git a/.github/workflows/on-target.yml b/.github/workflows/on-target.yml index 20121ee8..67a1d57b 100644 --- a/.github/workflows/on-target.yml +++ b/.github/workflows/on-target.yml @@ -1,7 +1,9 @@ on: push: - branches: [ staging, trying, master ] + branches-ignore: + - "gh-readonly-queue/**" pull_request: + merge_group: # allows manual triggering workflow_dispatch: diff --git a/.github/workflows/rt-ci.yml b/.github/workflows/rt-ci.yml index d46e48a2..383e013b 100644 --- a/.github/workflows/rt-ci.yml +++ b/.github/workflows/rt-ci.yml @@ -1,7 +1,9 @@ on: push: - branches: [ staging, trying, master ] + branches-ignore: + - "gh-readonly-queue/**" pull_request: + merge_group: name: cortex-m-rt CI diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml index c29106ec..c19695a7 100644 --- a/.github/workflows/rustfmt.yml +++ b/.github/workflows/rustfmt.yml @@ -1,7 +1,9 @@ on: push: - branches: [ staging, trying, master ] + branches-ignore: + - "gh-readonly-queue/**" pull_request: + merge_group: name: Code formatting check