[GitHub] houshengbo closed pull request #837: Set the default tag to latest

[GitBox <gi...@apache.org>]

houshengbo closed pull request #837: Set the default tag to latest
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/837
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 2060fa7b..dc3d16a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,16 +50,7 @@ script:
 - "./tools/travis/script.sh"
 after_success:
 - DEPLOY_BUILD_READY=true
-# This tag is automatically generated for the latest merged commit in master branch.
-- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$TRAVIS_OS_NAME" == "linux" ] ; then
-    git config --global user.email "builds@travis-ci.com";
-    git config --global user.name "Travis CI";
-    export GIT_TAG="latest";
-    git tag -d $GIT_TAG;
-    git push -q https://$API_KEY@github.com/apache/incubator-openwhisk-wskdeploy :refs/tags/$GIT_TAG;
-    GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER";
-    git push -f -q https://$API_KEY@github.com/apache/incubator-openwhisk-wskdeploy $GIT_TAG;
-  fi
+
 after_script:
 - make clean
 before_deploy:
@@ -69,6 +60,17 @@ before_deploy:
 - ./gradlew --console=plain releaseBinaries
 - export RELEASE_PKG_FILE="$(cd "$TRAVIS_BUILD_DIR/release" && ls ${zip_file_name}-*.tgz ${zip_file_name}-*.zip)"
 - echo "Deploying $RELEASE_PKG_FILE to GitHub releases."
+- export GIT_TAG="latest"
+- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$TRAVIS_OS_NAME" == "linux" ] ; then
+      git config --global user.email "builds@travis-ci.com";
+      git config --global user.name "Travis CI";
+      git tag -d $GIT_TAG;
+      git push -q https://$API_KEY@github.com/apache/incubator-openwhisk-wskdeploy :refs/tags/$GIT_TAG;
+      GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER";
+  fi
+- if [ ! -z "$TRAVIS_TAG" ] ; then
+      export GIT_TAG=$TRAVIS_TAG;
+  fi
 
 deploy:
 - provider: releases
@@ -81,8 +83,7 @@ deploy:
   overwrite: true
   skip_cleanup: true
   target_commitish: $TRAVIS_COMMIT
-  tag_name: $TRAVIS_TAG
-  name: $TRAVIS_TAG
+  tag_name: $GIT_TAG
   on:
     repo: apache/incubator-openwhisk-wskdeploy
     condition: "$DEPLOY_BUILD_READY = true"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services