Skip to content

Commit

Permalink
Enable "merge_group" events for GitHub's merge queue
Browse files Browse the repository at this point in the history
We need to also trigger on the "merge_group" event for GitHub's
merge queue to work. This is the same as <freedomofpress/securedrop-dev-docs#130>.
  • Loading branch information
legoktm committed Feb 21, 2024
1 parent 5f76f10 commit 4e3d2e1
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Package builds
on: [push, pull_request]
on: [merge_group, push, pull_request]

defaults:
run:
Expand Down Expand Up @@ -36,7 +36,7 @@ jobs:
PKG_DIR=../proxy make -C securedrop-builder requirements
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git diff --ignore-matching-lines=# --exit-code
build-debs:
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cargo-vet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: cargo vet

on: [push, pull_request]
on: [merge_group, push, pull_request]

jobs:
cargo-vet:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: CI
on: [push, pull_request]
on: [merge_group, push, pull_request]

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdk.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: SDK
on: [push, pull_request]
on: [merge_group, push, pull_request]

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Tests
on: [push, pull_request]
on: [merge_group, push, pull_request]

defaults:
run:
Expand Down

0 comments on commit 4e3d2e1

Please sign in to comment.