Use --release in dev/release.sh
Fixes #18243.
Fixes #18242.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18305)
diff --git a/dev/release.sh b/dev/release.sh
index 4d6dd74..ede8bc2 100755
--- a/dev/release.sh
+++ b/dev/release.sh
@@ -339,7 +339,7 @@
git add -u
git commit $git_quiet -m $'make update\n\nRelease: yes'
if [ -n "$reviewers" ]; then
- addrev --nopr $reviewers
+ addrev --release --nopr $reviewers
fi
fi
@@ -377,7 +377,7 @@
git add -u
git commit $git_quiet -m "Prepare for release of $release_text"$'\n\nRelease: yes'
if [ -n "$reviewers" ]; then
- addrev --nopr $reviewers
+ addrev --release --nopr $reviewers
fi
echo "Tagging release with tag $tag. You may need to enter a pass phrase"
git tag$tagkey "$tag" -m "OpenSSL $release release tag"
@@ -479,7 +479,7 @@
git add -u
git commit $git_quiet -m "Prepare for $release_text"$'\n\nRelease: yes'
if [ -n "$reviewers" ]; then
- addrev --nopr $reviewers
+ addrev --release --nopr $reviewers
fi
# Push everything to the parent repo
@@ -510,7 +510,7 @@
git add -u
git commit $git_quiet -m "Prepare for $release_text"$'\n\nRelease: yes'
if [ -n "$reviewers" ]; then
- addrev --nopr $reviewers
+ addrev --release --nopr $reviewers
fi
fi
@@ -567,11 +567,11 @@
When merging them into the main repository, do it like this:
- git push openssl-git@git.openssl.org:openssl.git \\
+ git push git@github.openssl.org:openssl/openssl.git \\
$tmp_release_branch:$release_branch
- git push openssl-git@git.openssl.org:openssl.git \\
+ git push git@github.openssl.org:openssl/openssl.git \\
$tmp_update_branch:$update_branch
- git push openssl-git@git.openssl.org:openssl.git \\
+ git push git@github.openssl.org:openssl/openssl.git \\
$tag
EOF
else
@@ -583,9 +583,9 @@
When merging it into the main repository, do it like this:
- git push openssl-git@git.openssl.org:openssl.git \\
+ git push git@github.openssl.org:openssl/openssl.git \\
$tmp_release_branch:$release_branch
- git push openssl-git@git.openssl.org:openssl.git \\
+ git push git@github.openssl.org:openssl/openssl.git \\
$tag
EOF
fi