Skip to content

Commit

Permalink
Merge pull request #1020 from luncj/build/fix-release-workflow-releas…
Browse files Browse the repository at this point in the history
…e-1.0

[cherry pick #1019 for 1.0] build(release): fix the branch to scrape while originating from master
  • Loading branch information
k8s-ci-robot authored Jan 19, 2022
2 parents c357f83 + aa99cac commit f9ecf2a
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ jobs:
VERSION_PATCH="${VERSION##*.}"
BRANCH=release-${VERSION_MAJOR}.${VERSION_MINOR}
if [[ ! `git branch --list ${BRANCH}` ]]; then
BRANCH=master
fi
if [[ "${VERSION_PATCH}" = "0" ]]; then
START_SHA=$(git rev-parse v${VERSION_MAJOR}.$((VERSION_MINOR-1)).0)
else
Expand Down

0 comments on commit f9ecf2a

Please sign in to comment.