From 48f326d10fa5ed0f3e1f04efa684e1573ec9a0ef Mon Sep 17 00:00:00 2001 From: Diego Barrios Romero Date: Tue, 27 Jun 2023 20:52:37 +0200 Subject: [PATCH] Switch to GHMQ --- .github/bors.toml | 4 ---- .github/workflows/ci.yml | 8 +++++--- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 .github/bors.toml diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index c3cfa378..00000000 --- a/.github/bors.toml +++ /dev/null @@ -1,4 +0,0 @@ -block_labels = ["needs-decision"] -delete_merged_branches = true -required_approvals = 1 -status = ["build"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1e3d552..9018d114 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,11 @@ name: CI 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 jobs: build: