You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by lr...@apache.org on 2017/07/20 01:37:30 UTC

[44/50] [abbrv] incubator-livy-website git commit: [BAHIR-88] Additional fixes to produce proper rc distribution

[BAHIR-88] Additional fixes to produce proper rc distribution


Project: http://git-wip-us.apache.org/repos/asf/incubator-livy-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy-website/commit/6d9a4d7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy-website/tree/6d9a4d7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy-website/diff/6d9a4d7a

Branch: refs/heads/master
Commit: 6d9a4d7ab0c1eff0bf63e91cec32b601c263f790
Parents: 5d8fc42
Author: Luciano Resende <lr...@apache.org>
Authored: Wed Jun 7 21:28:58 2017 -0700
Committer: Luciano Resende <lr...@apache.org>
Committed: Wed Jun 7 21:29:39 2017 -0700

----------------------------------------------------------------------
 dev/release-build.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-livy-website/blob/6d9a4d7a/dev/release-build.sh
----------------------------------------------------------------------
diff --git a/dev/release-build.sh b/dev/release-build.sh
index fdb1f37..2cfcd27 100755
--- a/dev/release-build.sh
+++ b/dev/release-build.sh
@@ -200,7 +200,7 @@ if [ -z "$RELEASE_TAG" ]; then
   RELEASE_TAG="v$RELEASE_VERSION-$RELEASE_RC"
 fi
 
-RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/bahir/"
+RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/bahir/bahir-spark"
 
 
 echo "  "
@@ -233,10 +233,6 @@ function checkout_code {
     git_hash=`git rev-parse --short HEAD`
     echo "Checked out Bahir git hash $git_hash"
 
-    git clean -d -f -x
-    #rm .gitignore
-    #rm -rf .git
-
     cd "$BASE_DIR" #return to base dir
 }
 
@@ -247,30 +243,31 @@ if [[ "$RELEASE_PREPARE" == "true" ]]; then
     cd target/bahir
 
     # Build and prepare the release
-    $MVN $PUBLISH_PROFILES release:clean release:prepare $DRY_RUN -Darguments="-Dgpg.passphrase=\"$GPG_PASSPHRASE\" -DskipTests" -DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$DEVELOPMENT_VERSION" -Dtag="$RELEASE_TAG"
+#$MVN $PUBLISH_PROFILES release:clean release:prepare $DRY_RUN -Darguments="-Dgpg.passphrase=\"$GPG_PASSPHRASE\" -DskipTests" -DreleaseVersion="$RELEASE_VERSION" -DdevelopmentVersion="$DEVELOPMENT_VERSION" -Dtag="$RELEASE_TAG"
 
     cd .. #exit bahir
 
     if [ -z "$DRY_RUN" ]; then
-        svn co $RELEASE_STAGING_LOCATION svn-bahir
-        mkdir -p svn-bahir/$RELEASE_VERSION-$RELEASE_RC
-
         cd "$BASE_DIR/target/bahir"
         git checkout $RELEASE_TAG
         git clean -d -f -x
 
         $MVN $PUBLISH_PROFILES clean install -DskiptTests -Darguments="-DskipTests"
 
+        cd "$BASE_DIR/target"
+        svn co $RELEASE_STAGING_LOCATION svn-bahir
+        mkdir -p svn-bahir/$RELEASE_VERSION-$RELEASE_RC
+
         cp bahir/distribution/target/*.tar.gz svn-bahir/$RELEASE_VERSION-$RELEASE_RC/
         cp bahir/distribution/target/*.zip    svn-bahir/$RELEASE_VERSION-$RELEASE_RC/
 
         cd svn-bahir/$RELEASE_VERSION-$RELEASE_RC/
         rm -f *.asc
-        for i in *.zip *.tgz; do gpg --output $i.asc --detach-sig --armor $i; done
+        for i in *.zip *.tar.gz; do gpg --output $i.asc --detach-sig --armor $i; done
         rm -f *.md5
-        for i in *.zip *.tgz; do openssl md5 -hex $i | sed 's/MD5(\([^)]*\))= \([0-9a-f]*\)/\2 *\1/' > $i.md5; done
+        for i in *.zip *.tar.gz; do openssl md5 -hex $i | sed 's/MD5(\([^)]*\))= \([0-9a-f]*\)/\2 *\1/' > $i.md5; done
         rm -f *.sha
-        for i in *.zip *.tgz; do shasum $i > $i.sha; done
+        for i in *.zip *.tar.gz; do shasum $i > $i.sha; done
 
         cd .. #exit $RELEASE_VERSION-$RELEASE_RC/