Skip to content

Commit

Permalink
Prepare use of GitHub merge queues (#3408)
Browse files Browse the repository at this point in the history
Merge queues should help us avoid having to merge from main repeatedly
even when all approvals are in and all CI jobs have succeeded. See
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.

Co-authored-by: Felipe R. Monteiro <felisous@amazon.com>
  • Loading branch information
tautschnig and feliperodri authored Aug 2, 2024
1 parent 7546911 commit 24fc8aa
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
name: Cargo Audit
on:
pull_request:
merge_group:
push:
# Run on changes to branches but not tags.
branches:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
name: Kani Format Check
on:
pull_request:
merge_group:
push:
# Not just any push, as that includes tags.
# We don't want to re-trigger this workflow when tagging an existing commit.
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/kani.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
name: Kani CI
on:
pull_request:
merge_group:
push:
# Not just any push, as that includes tags.
# We don't want to re-trigger this workflow when tagging an existing commit.
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
name: Release Bundle
on:
pull_request:
merge_group:
push:
branches:
- 'main'
Expand Down

0 comments on commit 24fc8aa

Please sign in to comment.