diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-03-15 08:07:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 08:07:20 -0400 |
| commit | 121fce7500329be61eac46eaa63bb3a0c1c54344 (patch) | |
| tree | 1d8c056c7da1134188c09c68b87cc12ffda9b21a /.github/workflows | |
| parent | Add schema comments about the `destinations` and `destination_rooms` tables. ... (diff) | |
| download | synapse-121fce7500329be61eac46eaa63bb3a0c1c54344.tar.xz | |
Enable running tests & release artifacts on merge queue. (#15244)
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/release-artifacts.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/tests.yml | 1 |
2 files changed, 4 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: |