branch sync: trickle bugfixes up the release branches#112
Merged
oliver-sanders merged 2 commits intocylc:v1from Aug 4, 2025
Merged
branch sync: trickle bugfixes up the release branches#112oliver-sanders merged 2 commits intocylc:v1from
oliver-sanders merged 2 commits intocylc:v1from
Conversation
MetRonnie
reviewed
Jul 31, 2025
.github/workflows/branch-sync.yml
Outdated
| break | ||
| fi | ||
| done | ||
| echo "BASE_BRANCH=$branch" >> "$GITHUB_OUTPUT" |
Member
There was a problem hiding this comment.
(1/2) Think we don't need the output
Suggested change
| echo "BASE_BRANCH=$branch" >> "$GITHUB_OUTPUT" |
.github/workflows/branch-sync.yml
Outdated
|
|
||
| - name: Configure git | ||
| uses: cylc/release-actions/configure-git@v1 | ||
| ref: ${{ steps.get-base-branch.BASE_BRANCH }} |
Member
There was a problem hiding this comment.
(2/2)
Suggested change
| ref: ${{ steps.get-base-branch.BASE_BRANCH }} | |
| ref: ${{ env.BASE_BRANCH }} |
.github/workflows/branch-sync.yml
Outdated
| fi | ||
| done | ||
| echo "BASE_BRANCH=$branch" >> "$GITHUB_OUTPUT" | ||
| echo "BASE_BRANCH=$branch" >> "$GITHUB_ENV" |
Member
There was a problem hiding this comment.
Mistake? (Credit to GH Copilot for spotting this!)
Suggested change
| echo "BASE_BRANCH=$branch" >> "$GITHUB_ENV" | |
| echo "BASE_BRANCH=$base_branch" >> "$GITHUB_ENV" |
.github/workflows/branch-sync.yml
Outdated
| # * if a change is made to 1.4.x, merge it into master. | ||
|
|
||
| # default to the HEAD branch (typically either master or main) | ||
| base_branch=$(git remote show origin | sed -n 's/.*HEAD branch: \(.*\)/\1/p') |
Member
There was a problem hiding this comment.
I also asked Copilot how to do this with GH CLI instead which might be nicer (I've tested it):
gh repo view --json defaultBranchRef -q .defaultBranchRef.name
Suggested change
| base_branch=$(git remote show origin | sed -n 's/.*HEAD branch: \(.*\)/\1/p') | |
| base_branch=$(gh repo view --json defaultBranchRef -q .defaultBranchRef.name) |
MetRonnie
approved these changes
Aug 4, 2025
Member
MetRonnie
left a comment
MetRonnie
left a comment
There was a problem hiding this comment.
@oliver-sanders Merge if you're happy with my added commit
This was referenced Aug 4, 2025
This was referenced Aug 12, 2025
Merged
Merged
Merged
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.
[Low priority until 8.6.0 is released]
It is likely that the 8.6.x branch will continue development post 8.7.0 release, so it's time to exercise our release branch system for real!
At present the branch sync will only sync into master, with this PR it will pick the next sequential release branch instead, defaulting to master once release branches have been exhausted.
Ideally:
I'm not sure whether the (2) will happen automatically or not though?
I'm also not sure how to test this.