fix: target correct base branch for docker-versions PR #1848
Conversation
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
The workflow was creating PRs against the default branch (main) instead of the branch where it was running. When running on weekly, this caused PRs trying to merge the entire weekly history into main. Now extracts the current branch from GITHUB_REF and uses it as the base branch for the PR, ensuring docker-versions updates stay on the same branch.
Closed
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
Fixes the docker-versions-update workflow to create PRs against the correct base branch instead of always targeting main.
Problem
PR #1847 demonstrates the issue: the workflow runs on the
weeklybranch, creates adocker-versions-updatebranch from weekly, but then creates a PR targetingmain(the repo's default branch). This results in a PR trying to merge the entire weekly branch history into main - hundreds of commits that should never be merged.Root Cause
In
.github/workflows/github-docker-registry-push.yml, the step "Commit and create PR for Docker versions" uses:Without specifying
--base, this defaults to the repository's default branch (main), regardless of which branch the workflow is running on.Solution
Extract the current branch from
GITHUB_REFand explicitly pass it as the base branch:This ensures docker-versions updates create PRs back to the same branch they're running on (weekly→weekly, main→main, etc.).
Impact
Related