[incubator-openwhisk-cli] branch master updated: Add the LICENSE and NOTICE files into the binary packages

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new ea12cc2  Add the LICENSE and NOTICE files into the binary packages
ea12cc2 is described below

commit ea12cc21d6802ce3f6f4fbc38947178399e04862
Author: Vincent Hou <sh...@us.ibm.com>
AuthorDate: Wed Apr 4 11:16:13 2018 -0400

    Add the LICENSE and NOTICE files into the binary packages
---
 .travis.yml  | 16 +++++-----------
 build.gradle |  3 +++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 362cdff..ecc0800 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,11 @@ script:
   - cd $TRAVIS_BUILD_DIR/../incubator-openwhisk
   - ./gradlew install
   - cd $TRAVIS_BUILD_DIR
-  - ./gradlew --console=plain releaseBinaries
+  - export BUILD_VERSION="latest"
+  - if [ ! -z "$TRAVIS_TAG" ] ; then
+        export BUILD_VERSION=$TRAVIS_TAG;
+    fi
+  - ./gradlew --console=plain releaseBinaries -PpackageVersion=$BUILD_VERSION
   - ./tools/travis/test_openwhisk.sh
 
 after_success:
@@ -73,16 +77,6 @@ before_deploy:
   - echo "Deploying $RELEASE_PKG_FILE to GitHub releases."
   - export GIT_TAG="latest"
   - export TAG=false;
-  # 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-cli :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-cli $GIT_TAG;
-    fi
   - if [ ! -z "$TRAVIS_TAG" ] ; then
       export GIT_TAG=$TRAVIS_TAG;
       export TAG=true;
diff --git a/build.gradle b/build.gradle
index ba12cc8..b8bfb34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -220,6 +220,9 @@ task individualArchives(
                 baseName = "${p.zipFileName}-${packageVersion}-${p.owOs}-${p.goArch}"
                 from "./build/${p.goOs}-${p.goArch}/"
                 include "${buildFileName}*"
+                from "./"
+                include "LICENSE.txt", "NOTICE.txt", "README.md"
+                exclude "wski18n"
             }
     })
 

-- 
To stop receiving notification emails like this one, please contact
houshengbo@apache.org.