Skip to content

🐞 Proper checkout of resync branch #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Jul 4, 2025
Merged

🐞 Proper checkout of resync branch #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e374ca9
Proper checkout of resync branch
cardil Jul 4, 2025
8014b3d
Golangci-lint fixes
cardil Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pkg/sync/resync_releases.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,24 @@ func (r resyncRelease) run() error {
}
return runSteps([]step{
r.checkoutAs(downstreamRemote, downstreamBranch, syncBranch),
r.mergeUpstream(upstreamBranch, syncBranch, []step{
r.mergeUpstream(upstreamBranch, []step{
r.checkoutAs(upstreamRemote, upstreamBranch, syncBranch),
changesDetected,
}),
r.checkoutAs(upstreamRemote, upstreamBranch, syncBranch),
r.generateImages(r.rel),
r.commitChanges(r.ImagesGenerated, changesDetected),
func() error {
func() (err error) {
defer func() {
err = errors.Join(err, r.deleteBranch(syncBranch))
}()
if !changes {
return nil
}
return multiStep{
err = multiStep{
r.pushBranch(syncBranch),
r.createSyncReleasePR(downstreamBranch, upstreamBranch, syncBranch),
}.runSteps()
return
},
})
}
Expand All @@ -100,16 +103,13 @@ func (r resyncRelease) checkoutAs(remote git.Remote, targetBranch, branch string
}
}

func (r resyncRelease) mergeUpstream(upstreamBranch, syncBranch string, onChanges []step) step {
func (r resyncRelease) mergeUpstream(upstreamBranch string, onChanges []step) step {
upstream := git.Remote{
Name: "upstream",
URL: r.Upstream,
}
return func() error {
err := r.Merge(&upstream, upstreamBranch)
defer func() {
_ = r.deleteBranch(syncBranch)
}()
if errors.Is(err, gitv5.NoErrAlreadyUpToDate) {
r.Println("- no changes detected")
return nil
Expand Down
Loading