Merge pull request #263 from ajkannan/clean-before-deploy

Clean before deploying
googleapis · Oct 15, 2015 · 1cc1d3a · 1cc1d3a
2 parents 7115734 + 87d698b
commit 1cc1d3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/utilities/after_success.sh b/utilities/after_success.sh
@@ -32,9 +32,9 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
 
         cd ..
         utilities/update_docs_version.sh # Update version in READMEs
-        mvn deploy -DskipTests=true --settings target/travis/settings.xml -P sign-deploy
+        mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
     else
-        mvn deploy -DskipTests=true -Dgpg.skip=true --settings target/travis/settings.xml
+        mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
     fi
 else
     echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."

diff --git a/utilities/verify.sh b/utilities/verify.sh
@@ -5,13 +5,13 @@
 
 if [ "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     # Get signing tools and API keyfile
-    openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out target/travis/signing-tools.tar -d
-    mkdir target/travis/signing-tools
-    chmod 700 target/travis/signing-tools
-    tar xvf target/travis/signing-tools.tar -C target/travis/signing-tools
+    openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out $TRAVIS_BUILD_DIR/signing-tools.tar -d
+    mkdir $TRAVIS_BUILD_DIR/signing-tools
+    chmod 700 $TRAVIS_BUILD_DIR/signing-tools
+    tar xvf $TRAVIS_BUILD_DIR/signing-tools.tar -C $TRAVIS_BUILD_DIR/signing-tools
     # Export test env variables
     export GCLOUD_TESTS_PROJECT_ID="gcloud-devel"
-    export GCLOUD_TESTS_KEY=$TRAVIS_BUILD_DIR/target/travis/signing-tools/gcloud-devel-travis.json
+    export GCLOUD_TESTS_KEY=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json
     # Run verify
     mvn verify
 else