root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Use --release in dev/release.sh 

Fixes #18243.
Fixes #18242.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18305)
This commit is contained in:
Hugo Landau 2022-05-13 13:11:44 +01:00 committed by Matt Caswell
parent 36bbaa8b05
commit e4720b4d79
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dev/release.sh
View File

@ -339,7 +339,7 @@ if [ -n "$(git status --porcelain)" ]; then
git add -u git add -u
git commit $git_quiet -m $'make update\n\nRelease: yes' git commit $git_quiet -m $'make update\n\nRelease: yes'
if [ -n "$reviewers" ]; then if [ -n "$reviewers" ]; then
addrev --nopr $reviewers addrev --release --nopr $reviewers
fi fi
fi fi
@ -377,7 +377,7 @@ $VERBOSE "== Comitting updates and tagging"
git add -u git add -u
git commit $git_quiet -m "Prepare for release of $release_text"$'\n\nRelease: yes' git commit $git_quiet -m "Prepare for release of $release_text"$'\n\nRelease: yes'
if [ -n "$reviewers" ]; then if [ -n "$reviewers" ]; then
addrev --nopr $reviewers addrev --release --nopr $reviewers
fi fi
echo "Tagging release with tag $tag. You may need to enter a pass phrase" echo "Tagging release with tag $tag. You may need to enter a pass phrase"
git tag$tagkey "$tag" -m "OpenSSL $release release tag" git tag$tagkey "$tag" -m "OpenSSL $release release tag"
@ -479,7 +479,7 @@ $VERBOSE "== Committing updates"
git add -u git add -u
git commit $git_quiet -m "Prepare for $release_text"$'\n\nRelease: yes' git commit $git_quiet -m "Prepare for $release_text"$'\n\nRelease: yes'
if [ -n "$reviewers" ]; then if [ -n "$reviewers" ]; then
addrev --nopr $reviewers addrev --release --nopr $reviewers
fi fi
# Push everything to the parent repo # Push everything to the parent repo
@ -510,7 +510,7 @@ if $do_branch; then
git add -u git add -u
git commit $git_quiet -m "Prepare for $release_text"$'\n\nRelease: yes' git commit $git_quiet -m "Prepare for $release_text"$'\n\nRelease: yes'
if [ -n "$reviewers" ]; then if [ -n "$reviewers" ]; then
addrev --nopr $reviewers addrev --release --nopr $reviewers
fi fi
fi fi
@ -567,11 +567,11 @@ Push them to github, make PRs from them and have them approved:
When merging them into the main repository, do it like this: 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 $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 $tmp_update_branch:$update_branch
git push openssl-git@git.openssl.org:openssl.git \\ git push git@github.openssl.org:openssl/openssl.git \\
$tag $tag
EOF EOF
else else
@ -583,9 +583,9 @@ Push it to github, make a PR from it and have it approved:
When merging it into the main repository, do it like this: 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 $tmp_release_branch:$release_branch
git push openssl-git@git.openssl.org:openssl.git \\ git push git@github.openssl.org:openssl/openssl.git \\
$tag $tag
EOF EOF
fi fi