diff --git a/scripts/github-actions-packages b/scripts/github-actions-packages index 3c517a7cd40..8f1d712b0dd 100755 --- a/scripts/github-actions-packages +++ b/scripts/github-actions-packages @@ -18,5 +18,6 @@ sudo apt install -y \ libseccomp-dev \ libsystemd-dev \ libudev-dev \ + sed \ socat \ uuid-dev diff --git a/scripts/release-notes/release_notes.go b/scripts/release-notes/release_notes.go index 763ba356fab..21fa2efdee6 100644 --- a/scripts/release-notes/release_notes.go +++ b/scripts/release-notes/release_notes.go @@ -19,8 +19,9 @@ import ( ) const ( - branch = "gh-pages" - tokenKey = "GITHUB_TOKEN" + branch = "gh-pages" + tokenKey = "GITHUB_TOKEN" + defaultBranch = "main" ) var outputPath string @@ -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)