Dependabot auto-merge: retry the merge, then dispatch a targeted deploy - #74
Merged
Merged
Conversation
…ards Two gaps showed up on the first real auto-merges. The worker group PR failed with 'Base branch was modified' because the other two groups merged seconds earlier; the merge now retries up to five times and pins --match-head-commit so a head that moved after the checks is never merged. The two PRs that did merge never deployed: a merge made with GITHUB_TOKEN does not fire push-triggered workflows. workflow_dispatch is the exception, so the job now dispatches deploy.yml for the parts the PR touched. deploy.yml gains per-part inputs (api, content, dashboard) so a content-worker bump does not redeploy the API and dashboard; the human-facing all=true default is unchanged.
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
1 participant
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.
Summary
Two gaps from the first real auto-merges (#64, #65, #66):
Merge race. The worker group PR failed with
Base branch was modified. Review and try the merge again.because the other two groups merged seconds earlier. The merge step now retries up to five times, 30 s apart, and pins--match-head-commitso a head that moved after the checks were evaluated is never merged.Nothing deployed. #64 (content-worker) and #65 (dashboard) merged but no Deploy, Worker, or Dashboard run appeared on main. A merge made with
GITHUB_TOKENdoes not fire push-triggered workflows.workflow_dispatchis the documented exception, so after a successful merge the job now dispatchesdeploy.ymlfor exactly the parts the PR touched.deploy.ymlgainsapi,content,dashboardboolean inputs for that; the human-facingall=truedefault is unchanged. Becausedeploy.ymlruns typecheck and tests before each deploy, CI coverage on main is preserved as well.The two undeployed bumps were deployed by a manual
all=truedispatch alongside this PR, and #66 was merged by hand.Tested
actionlintpasses.deploy.ymlevaluatesinputs.api == trueto false on push events (inputs are empty there), so push behaviour is unchanged.