[GitHub] houshengbo closed pull request #266: Add the LICENSE and NOTICE files into the binary packages

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

houshengbo closed pull request #266: Add the LICENSE and NOTICE files into the binary packages
URL: https://github.com/apache/incubator-openwhisk-cli/pull/266
 
 
   

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 362cdff4..ecc08006 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 ba12cc80..b8bfb346 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"
             }
     })
 


 

----------------------------------------------------------------
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