Repository: incubator-livy Updated Branches: refs/heads/branch-0.5 01048b00f -> f6f574d22
[MINOR][BUILD] Improve release-build script Improved release-build.sh based on the 0.5.0-incubating release process. Includes: - Instead of forcing user to set env it prompts for required info, this also protects password inout - Creates temp dir to hold files created in release process and makes sure git ignores it Author: Alex Bozarth <ajboz...@us.ibm.com> Closes #76 from ajbozarth/script. (cherry picked from commit ec8dffdaa2a2c2d2f348bd6fd5d583e812480907) Signed-off-by: Alex Bozarth <ajboz...@us.ibm.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/f6f574d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/f6f574d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/f6f574d2 Branch: refs/heads/branch-0.5 Commit: f6f574d22b628d0471ae1e143c956f6df14b0221 Parents: 01048b0 Author: Alex Bozarth <ajboz...@us.ibm.com> Authored: Fri Feb 9 14:10:10 2018 -0800 Committer: Alex Bozarth <ajboz...@us.ibm.com> Committed: Fri Feb 9 14:10:22 2018 -0800 ---------------------------------------------------------------------- .gitignore | 1 + dev/release-build.sh | 60 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/f6f574d2/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 604010c..d46d49f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ reports/ metastore_db/ derby.log dependency-reduced-pom.xml +release-staging/ # For python setup.py, which pollutes the source dirs. python-api/dist http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/f6f574d2/dev/release-build.sh ---------------------------------------------------------------------- diff --git a/dev/release-build.sh b/dev/release-build.sh index 3d324d5..6b88218 100755 --- a/dev/release-build.sh +++ b/dev/release-build.sh @@ -50,19 +50,36 @@ if [[ $@ == *"help"* ]]; then exit_with_usage fi -for env in ASF_USERNAME ASF_PASSWORD GPG_PASSPHRASE RELEASE_RC; do - if [ -z "${!env}" ]; then - echo "ERROR: $env must be set to run this script" - exit_with_usage - fi -done - # Explicitly set locale in order to make `sort` output consistent across machines. # See https://stackoverflow.com/questions/28881 for more details. export LC_ALL=C +# Setup env + # Commit ref to checkout when building -GIT_REF=${GIT_REF:-master} +if [ -z "$GIT_REF" ]; then + read -p "Choose git branch/tag [master]: " GIT_REF + GIT_REF=${GIT_REF:-master} + echo $GIT_REF +fi + +# Set RELEASE_RC +if [ -z "$RELEASE_RC" ]; then + read -p "Choose RC [rc1]: " RELEASE_RC + RELEASE_RC=${RELEASE_RC:-rc1} + echo $RELEASE_RC +fi + +# Get ASF Login +if [ -z "$ASF_USERNAME" ]; then + read -p "ASF username: " ASF_USERNAME + echo $ASF_USERNAME +fi + +if [ -z "$ASF_PASSWORD" ]; then + read -s -p "ASF password: " ASF_PASSWORD + echo +fi # Destination directory on remote server RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/incubator/livy"; @@ -74,7 +91,11 @@ BASE_DIR=$(pwd) MVN="mvn" -rm -rf incubator-livy +# Use temp staging dir for release process +rm -rf release-staging +mkdir release-staging +cd release-staging + git clone https://git-wip-us.apache.org/repos/asf/incubator-livy.git cd incubator-livy git checkout $GIT_REF @@ -96,11 +117,11 @@ if [[ "$1" == "package" ]]; then echo "Packaging release tarballs" cp -r incubator-livy livy-$LIVY_VERSION-src zip -r livy-$LIVY_VERSION-src.zip livy-$LIVY_VERSION-src - echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --armour --output livy-$LIVY_VERSION-src.zip.asc \ + echo "" | $GPG --passphrase-fd 0 --armour --output livy-$LIVY_VERSION-src.zip.asc \ --detach-sig livy-$LIVY_VERSION-src.zip - echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --print-md MD5 livy-$LIVY_VERSION-src.zip > \ + echo "" | $GPG --passphrase-fd 0 --print-md MD5 livy-$LIVY_VERSION-src.zip > \ livy-$LIVY_VERSION-src.zip.md5 - echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --print-md \ + echo "" | $GPG --passphrase-fd 0 --print-md \ SHA512 livy-$LIVY_VERSION-src.zip > livy-$LIVY_VERSION-src.zip.sha512 rm -rf livy-$LIVY_VERSION-src @@ -115,13 +136,13 @@ if [[ "$1" == "package" ]]; then echo "Copying and signing regular binary distribution" cp assembly/target/livy-$LIVY_VERSION-bin.zip . - echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --armour \ + echo "" | $GPG --passphrase-fd 0 --armour \ --output livy-$LIVY_VERSION-bin.zip.asc \ --detach-sig livy-$LIVY_VERSION-bin.zip - echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --print-md \ + echo "" | $GPG --passphrase-fd 0 --print-md \ MD5 livy-$LIVY_VERSION-bin.zip > \ livy-$LIVY_VERSION-bin.zip.md5 - echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --print-md \ + echo "" | $GPG --passphrase-fd 0 --print-md \ SHA512 livy-$LIVY_VERSION-bin.zip > \ livy-$LIVY_VERSION-bin.zip.sha512 @@ -147,7 +168,10 @@ fi if [[ "$1" == "publish-release" ]]; then tmp_dir=$(mktemp -d livy-repo-XXXXX) - tmp_repo=`readlink -f "$tmp_dir"` + # the following recreates `readlink -f "$tmp_dir"` since readlink -f is unsupported on MacOS + cd $tmp_dir + tmp_repo=$(pwd) + cd .. cd incubator-livy # Publish Livy to Maven release repo @@ -176,7 +200,7 @@ if [[ "$1" == "publish-release" ]]; then echo "Creating hash and signature files" for file in $(find . -type f) do - echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --output $file.asc \ + echo "" | $GPG --passphrase-fd 0 --output $file.asc \ --detach-sig --armour $file; if [ $(command -v md5) ]; then # Available on OS X; -q to keep only hash @@ -212,5 +236,5 @@ if [[ "$1" == "publish-release" ]]; then fi cd .. -rm -rf incubator-livy +rm -rf release-staging echo "ERROR: expects to be called with 'package', 'publish-release'"
