diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2022-04-15 08:16:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-15 08:16:41 -0400 |
| commit | 1b8b7b7efddc574dcb0d3a68e4ceab46397fc3b9 (patch) | |
| tree | 3d6649593f938596313f6457978ad99bd522875e /.github/scripts | |
| parent | de2b36e0b734d9a8cdc66e6b0cab23c758862f30 (diff) | |
Fix branch handling for minor releases in release workflow. (#12690)
Diffstat (limited to '.github/scripts')
| -rwxr-xr-x | .github/scripts/prepare-release-base.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.github/scripts/prepare-release-base.sh b/.github/scripts/prepare-release-base.sh index cb6be8e7c7..48f3e18675 100755 --- a/.github/scripts/prepare-release-base.sh +++ b/.github/scripts/prepare-release-base.sh @@ -148,14 +148,13 @@ elif [ "${EVENT_TYPE}" = 'minor' ] && [ "${EVENT_VERSION}" != "nightly" ]; then echo "::error::A branch named ${branch_name} already exists in the repository." exit 1 fi - git branch "${branch_name}" - git checkout "${branch_name}" echo "${EVENT_VERSION}" > packaging/version || exit 1 echo "::set-output name=run::true" echo "::set-output name=message::Minor release ${EVENT_VERSION}." echo "::set-output name=ref::${EVENT_VERSION}" echo "::set-output name=type::release" - echo "::set-output name=branch::${branch_name}" + echo "::set-output name=branch::master" + echo "::set-output name=new-branch:${branch_name}" echo "::set-output name=version::$(tr -d 'v' < packaging/version)" elif [ "${EVENT_TYPE}" = 'major' ] && [ "${EVENT_VERSION}" != "nightly" ]; then echo "::notice::Preparing a major release build." |