Fix branch handling for patch releases.
Austin S. Hemmelgarn committed
Apr 15, 2022 at 09:39 UTC
e9d3f22fce5eea37593e0f23100edfcdf6fc3c8b
1 file changed
+1
-2
.github/scripts/prepare-release-base.sh
+1
-2
@@ -121,11 +121,10 @@ elif [ "${EVENT_TYPE}" = 'patch' ] && [ "${EVENT_VERSION}" != "nightly" ]; then
121
check_version_format || exit 1
122
check_for_existing_tag || exit 1
123
branch_name="$(echo "${EVENT_VERSION}" | cut -f 1-2 -d '.')"
124
- if [ -z "$(git branch --list "${branch_name}")" ]; then
124
+ if ! git checkout "${branch_name}"; then
125
echo "::error::Could not find a branch for the ${branch_name}.x release series."
126
exit 1
127
fi
128
- git checkout "${branch_name}"
128
minor_matches || exit 1
129
major_matches || exit 1
130
check_newer_patch_version || exit 1