From 589bf8a26604699a6d5263b0ce5f332211ee7e5b Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Fri, 10 Mar 2023 09:34:03 -0500 Subject: [PATCH 1/2] Enable running tests & release artifacts on merge queue. --- .github/workflows/release-artifacts.yml | 4 +++- .github/workflows/tests.yml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index bf57bcab6104..ebd7d298a9e9 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -4,13 +4,15 @@ name: Build release artifacts on: # we build on PRs and develop to (hopefully) get early warning - # of things breaking (but only build one set of debs) + # of things breaking (but only build one set of debs). PRs skip + # building wheels on macOS & ARM. pull_request: push: branches: ["develop", "release-*"] # we do the full build on tags. tags: ["v*"] + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 806bd2bfa440..d2b1d75536bf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,7 @@ on: push: branches: ["develop", "release-*"] pull_request: + merge_group: workflow_dispatch: concurrency: From 951f74b931447fafb569c058cf5cf4079e27e48f Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Fri, 10 Mar 2023 09:39:53 -0500 Subject: [PATCH 2/2] Newsfragment --- changelog.d/15244.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15244.misc diff --git a/changelog.d/15244.misc b/changelog.d/15244.misc new file mode 100644 index 000000000000..dacdcf4d5d6f --- /dev/null +++ b/changelog.d/15244.misc @@ -0,0 +1 @@ +Configure GitHub Actions for merge queues.