Skip to content

maint(resources): auto merge on branch name rather than label#15084

Merged
mcdurdin merged 1 commit intomasterfrom
maint/resources/15027-auto-merge-on-branch-name
Nov 3, 2025
Merged

maint(resources): auto merge on branch name rather than label#15084
mcdurdin merged 1 commit intomasterfrom
maint/resources/15027-auto-merge-on-branch-name

Conversation

@mcdurdin
Copy link
Copy Markdown
Member

In order to avoid a race condition where label can be added after the GHA starts, we will check the branch name instead of automerge label.

Fixes: #15027
Test-bot: skip
Build-bot: skip

@github-project-automation github-project-automation bot moved this to Todo in Keyman Oct 31, 2025
@github-actions github-actions bot added maint Maintenance work -- continuous integration, build scripts, infrastructure resources/ labels Oct 31, 2025
@mcdurdin mcdurdin requested a review from darcywong00 October 31, 2025 16:17
@keymanapp-test-bot
Copy link
Copy Markdown

User Test Results

Test specification and instructions

User tests are not required

@mcdurdin mcdurdin requested a review from rc-swag October 31, 2025 16:17
@keymanapp-test-bot keymanapp-test-bot bot added this to the A19S15 milestone Oct 31, 2025
@mcdurdin mcdurdin force-pushed the maint/resources/15027-auto-merge-on-branch-name branch from 1be2db2 to 7ba310a Compare October 31, 2025 16:21
In order to avoid a race condition where label can be added after the
GHA starts, we will check the branch name instead of `automerge` label.

Fixes: #15027
Test-bot: skip
Build-bot: skip
@mcdurdin mcdurdin force-pushed the maint/resources/15027-auto-merge-on-branch-name branch from 7ba310a to eb1babf Compare October 31, 2025 16:32
Copy link
Copy Markdown
Contributor

@darcywong00 darcywong00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mcdurdin mcdurdin merged commit 0dd3814 into master Nov 3, 2025
6 checks passed
@mcdurdin mcdurdin deleted the maint/resources/15027-auto-merge-on-branch-name branch November 3, 2025 04:21
@github-project-automation github-project-automation bot moved this from Todo to Done in Keyman Nov 3, 2025
@keyman-server
Copy link
Copy Markdown
Collaborator

Changes in this pull request will be available for download in Keyman version 19.0.155-alpha

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

maint Maintenance work -- continuous integration, build scripts, infrastructure resources/

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

maint(resources): use branch name auto/ for automatic PRs as automerge label can be added too late

3 participants