Thanks to visit codestin.com
Credit goes to github.com

Skip to content

scripts: fix release branch forward script #5388

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-robot merged 1 commit into from
Oct 20, 2021
+4 −3
Merged

scripts: fix release branch forward script #5388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions scripts/release-branch-forward/release_branch_forward.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This tools automatically finds the latest CRI-O release branch and merges
// the latest master branch into it. This happens only if there is no
// the latest main branch into it. This happens only if there is no
// tag present on the release branch.
package main

Expand All @@ -21,6 +21,7 @@ const (
tail = "tail"
releaseBranchPrefix = "release-"
dryRunEnv = "DRY_RUN"
defaultBranch = "main"
)

var dryRun bool
Expand Down Expand Up @@ -108,8 +109,8 @@ func run() error {
err = repo.Checkout(currentBranch)
}()

// Merge the latest master
mergeTarget := kgit.Remotify(kgit.DefaultBranch)
// Merge the latest main
mergeTarget := kgit.Remotify(defaultBranch)
if err := repo.Merge(mergeTarget); err != nil {
return errors.Wrapf(err,
"unable to merge %s into release branch", mergeTarget,
Expand Down