summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2023-03-15 08:07:20 -0400
committerGitHub <noreply@github.com>2023-03-15 08:07:20 -0400
commit121fce7500329be61eac46eaa63bb3a0c1c54344 (patch)
tree1d8c056c7da1134188c09c68b87cc12ffda9b21a
parentAdd schema comments about the `destinations` and `destination_rooms` tables. ... (diff)
downloadsynapse-121fce7500329be61eac46eaa63bb3a0c1c54344.tar.xz
Enable running tests & release artifacts on merge queue. (#15244)
Diffstat (limited to '')
-rw-r--r--.github/workflows/release-artifacts.yml4
-rw-r--r--.github/workflows/tests.yml1
-rw-r--r--changelog.d/15244.misc1
3 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
index bf57bcab61..ebd7d298a9 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 806bd2bfa4..d2b1d75536 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:
diff --git a/changelog.d/15244.misc b/changelog.d/15244.misc
new file mode 100644
index 0000000000..dacdcf4d5d
--- /dev/null
+++ b/changelog.d/15244.misc
@@ -0,0 +1 @@
+Configure GitHub Actions for merge queues.