diff options
author | Peter Eckersley <pde@eff.org> | 2016-05-12 02:03:01 +0300 |
---|---|---|
committer | Peter Eckersley <pde@eff.org> | 2016-05-12 02:03:01 +0300 |
commit | 54220a13365e038f13705a1e985022628af862ee (patch) | |
tree | 2544e239dbb3b7c19ec7cbdd707d0b5098e154af /tools | |
parent | ba7688ba99cf78f0ef1eff856965e06c4a3d43b3 (diff) | |
parent | 255e205c1ab5ac471783f6f63ee43ee51e5956e6 (diff) |
Merge remote-tracking branch 'origin/master' into new-dl
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/release.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/release.sh b/tools/release.sh index 042aa5259..2e26e3dab 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -45,7 +45,7 @@ export GPG_TTY=$(tty) PORT=${PORT:-1234} # subpackages to be released -SUBPKGS=${SUBPKGS:-"acme certbot-apache certbot-nginx letshelp-certbot"} +SUBPKGS=${SUBPKGS:-"acme certbot-apache certbot-nginx letshelp-certbot letsencrypt letsencrypt-apache letsencrypt-nginx letshelp-letsencrypt"} subpkgs_modules="$(echo $SUBPKGS | sed s/-/_/g)" # certbot_compatibility_test is not packaged because: # - it is not meant to be used by anyone else than Certbot devs @@ -162,12 +162,12 @@ done deactivate # pin pip hashes of the things we just built -for pkg in acme certbot certbot-apache ; do +for pkg in acme certbot certbot-apache letsencrypt letsencrypt-apache ; do echo $pkg==$version \\ pip hash dist."$version/$pkg"/*.{whl,gz} | grep "^--hash" | python2 -c 'from sys import stdin; input = stdin.read(); print " ", input.replace("\n--hash", " \\\n --hash"),' done > /tmp/hashes.$$ -if ! wc -l /tmp/hashes.$$ | grep -qE "^\s*9 " ; then +if ! wc -l /tmp/hashes.$$ | grep -qE "^\s*15 " ; then echo Unexpected pip hash output exit 1 fi @@ -191,9 +191,10 @@ done gpg -u "$RELEASE_GPG_KEY" --detach-sign --armor --sign letsencrypt-auto-source/letsencrypt-auto # copy leauto to the root, overwriting the previous release version +cp -p letsencrypt-auto-source/letsencrypt-auto certbot-auto cp -p letsencrypt-auto-source/letsencrypt-auto letsencrypt-auto -git add letsencrypt-auto letsencrypt-auto-source +git add certbot-auto letsencrypt-auto letsencrypt-auto-source git diff --cached git commit --gpg-sign="$RELEASE_GPG_KEY" -m "Release $version" git tag --local-user "$RELEASE_GPG_KEY" --sign --message "Release $version" "$tag" |