diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-08-31 12:07:33 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-09-07 13:41:57 +0200 |
| commit | b933c390cccdb69be09ed9738770368fe7cd1eb4 (patch) | |
| tree | 51edfe181029cce876cc83b7b59900f3a1d84e73 /dev | |
| parent | 54d987b92ce57c1cc38c6d9b6bf879b003f4cbd4 (diff) | |
dev/release.sh: Adjust release branch names to votes
The OTC voted today that the release branch for OpenSSL 3.0 should be
openssl-3.0 rather than openssl-3.0.x. The release script is changed
accordingly.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16481)
(cherry picked from commit 8e706c8ae5d6abf69b1b0aa0c4ab3517607522d0)
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/release.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dev/release.sh b/dev/release.sh index 3e7fc27ea9..4b778f3b75 100755 --- a/dev/release.sh +++ b/dev/release.sh @@ -20,7 +20,7 @@ Usage: release.sh [ options ... ] --final Get out of "alpha" or "beta" and make a final release. Implies --branch. ---branch Create a release branch 'openssl-{major}.{minor}.x', +--branch Create a release branch 'openssl-{major}.{minor}', where '{major}' and '{minor}' are the major and minor version numbers. @@ -218,7 +218,7 @@ if (echo "$orig_branch" \ | grep -E -q \ -e '^master$' \ -e '^OpenSSL_[0-9]+_[0-9]+_[0-9]+[a-z]*-stable$' \ - -e '^openssl-[0-9]+\.[0-9]+\.x$'); then + -e '^openssl-[0-9]+\.[0-9]+$'); then : elif $force; then : @@ -253,7 +253,7 @@ get_version # changes for the release, the update branch is where we make the post- # release changes update_branch="$orig_branch" -release_branch="openssl-$SERIES.x" +release_branch="openssl-$SERIES" # among others, we only create a release branch if the patch number is zero if [ "$update_branch" = "$release_branch" ] || [ $PATCH -ne 0 ]; then @@ -694,9 +694,9 @@ This implies B<--branch>. =item B<--branch> -Create a branch specific for the I<SERIES>.x release series, if it doesn't +Create a branch specific for the I<SERIES> release series, if it doesn't already exist, and switch to it. The exact branch name will be -C<< openssl-I<SERIES>.x >>. +C<< openssl-I<SERIES> >>. =item B<--no-upload> @@ -751,7 +751,7 @@ C<< OpenSSL_I<VERSION> >> for regular releases, or C<< OpenSSL_I<VERSION>-preI<n> >> for pre-releases. From OpenSSL 3.0 ongoing, the release branches are named -C<< openssl-I<SERIES>.x >>, and the release tags are named +C<< openssl-I<SERIES> >>, and the release tags are named C<< openssl-I<VERSION> >> for regular releases, or C<< openssl-I<VERSION>-alphaI<n> >> for alpha releases and C<< openssl-I<VERSION>-betaI<n> >> for beta releases. |