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

Skip to content

[release-1.21] release-notes: update to main #5454

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 2 commits into from
Nov 12, 2021
Merged

[release-1.21] release-notes: update to main #5454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cfc2a1
release-notes: update to main
haircommander Nov 8, 2021
b8718c1
gh-actions: add sed for kube e2e
haircommander Nov 8, 2021
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
1 change: 1 addition & 0 deletions scripts/github-actions-packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ sudo apt install -y \
libseccomp-dev \
libsystemd-dev \
libudev-dev \
sed \
socat \
uuid-dev
9 changes: 5 additions & 4 deletions scripts/release-notes/release_notes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import (
)

const (
branch = "gh-pages"
tokenKey = "GITHUB_TOKEN"
branch = "gh-pages"
tokenKey = "GITHUB_TOKEN"
defaultBranch = "main"
)

var outputPath string
Expand Down Expand Up @@ -73,13 +74,13 @@ func run() error {
}
logrus.Infof("Using HEAD commit %s", head)

targetBranch := git.DefaultBranch
targetBranch := defaultBranch
currentBranch, err := repo.CurrentBranch()
if err != nil {
return errors.Wrap(err, "get current branch")
}
logrus.Infof("Found current branch %s", currentBranch)
if git.IsReleaseBranch(currentBranch) && currentBranch != git.DefaultBranch {
if git.IsReleaseBranch(currentBranch) && currentBranch != defaultBranch {
targetBranch = currentBranch
}
logrus.Infof("Using target branch %s", targetBranch)
Expand Down