Bug 2056699 - CI: Auto-merge PRs from admins that are only touching repositories.yaml - #1051
Draft
badboy wants to merge 1 commit into
Draft
Bug 2056699 - CI: Auto-merge PRs from admins that are only touching repositories.yaml#1051badboy wants to merge 1 commit into
badboy wants to merge 1 commit into
Conversation
badboy
commented
Jul 22, 2026
| ) | ||
|
|
||
| # Enable auto-merge on the new pull request | ||
| pr.enable_automerge(merge_method="REBASE") |
Member
Author
There was a problem hiding this comment.
Yes, I just recently added that, but it turns out it doesn't help us much because the workflow won't merge until a review anyway, so we're forcing the merge in the other workflow (see above). Thus we don't need GitHub's own auto-merge workflow
Contributor
|
Auto-merge aborted. '.github/workflows/build-test-deploy.yml' was modified. Only repositories.txt changes are merged automatically. |
badboy
force-pushed
the
ci-auto-merge-prs-from-admins-/xpymsqvxkovu
branch
from
July 27, 2026 16:16
ec3c958 to
d45ccb3
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
badboy
force-pushed
the
ci-auto-merge-prs-from-admins-/xpymsqvxkovu
branch
2 times, most recently
from
July 27, 2026 16:20
fb37314 to
a3cf194
Compare
|
|
||
| - name: Generate a token | ||
| id: generate-token | ||
| uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0 |
They are ONLY merged after tests succeed!
badboy
force-pushed
the
ci-auto-merge-prs-from-admins-/xpymsqvxkovu
branch
from
July 27, 2026 16:23
a3cf194 to
a34218d
Compare
Member
Author
|
This is now using a (not-yet-set-up) GitHub app to get a token to use. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
They are ONLY merged after tests succeed!
We could add additional checks to make sure this only applies to PRs opened by the fog-updater.
It's also currently missing a secret (
GH_PAT) that is a Personal Access Token from one of us (e.g. me) with admin privileges, so that the github action can force the merge (and overwriting our "requires a reviewer" protection).Alternatively we could use either a bot account or a GitHub app with the right permissions, both of which are a bit more involved to do.