mirror of
https://github.com/openssl/openssl.git
synced 2025-02-17 14:32:04 +08:00
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)
This commit is contained in:
parent
0db53e9312
commit
22dbb176de
@ -339,7 +339,7 @@ if [ -n "$(git status --porcelain)" ]; then
|
||||
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 @@ $VERBOSE "== Committing updates and tagging"
|
||||
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 @@ $VERBOSE "== Committing updates"
|
||||
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 @@ if $do_branch; then
|
||||
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 @@ Push them to github, make PRs from them and have them approved:
|
||||
|
||||
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 @@ Push it to github, make a PR from it and have it approved:
|
||||
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user