Skip to content

Commit ea12cc2

Browse files
author
Vincent Hou
committed
Add the LICENSE and NOTICE files into the binary packages
1 parent 3397d54 commit ea12cc2

2 files changed

Lines changed: 8 additions & 11 deletions

File tree

.travis.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ script:
6262
- cd $TRAVIS_BUILD_DIR/../incubator-openwhisk
6363
- ./gradlew install
6464
- cd $TRAVIS_BUILD_DIR
65-
- ./gradlew --console=plain releaseBinaries
65+
- export BUILD_VERSION="latest"
66+
- if [ ! -z "$TRAVIS_TAG" ] ; then
67+
export BUILD_VERSION=$TRAVIS_TAG;
68+
fi
69+
- ./gradlew --console=plain releaseBinaries -PpackageVersion=$BUILD_VERSION
6670
- ./tools/travis/test_openwhisk.sh
6771

6872
after_success:
@@ -73,16 +77,6 @@ before_deploy:
7377
- echo "Deploying $RELEASE_PKG_FILE to GitHub releases."
7478
- export GIT_TAG="latest"
7579
- export TAG=false;
76-
# This tag is automatically generated for the latest merged commit in master branch.
77-
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$TRAVIS_OS_NAME" == "linux" ] ; then
78-
git config --global user.email "builds@travis-ci.com";
79-
git config --global user.name "Travis CI";
80-
export GIT_TAG="latest";
81-
git tag -d $GIT_TAG;
82-
git push -q https://$API_KEY@github.com/apache/incubator-openwhisk-cli :refs/tags/$GIT_TAG;
83-
GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER";
84-
git push -f -q https://$API_KEY@github.com/apache/incubator-openwhisk-cli $GIT_TAG;
85-
fi
8680
- if [ ! -z "$TRAVIS_TAG" ] ; then
8781
export GIT_TAG=$TRAVIS_TAG;
8882
export TAG=true;

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@ task individualArchives(
220220
baseName = "${p.zipFileName}-${packageVersion}-${p.owOs}-${p.goArch}"
221221
from "./build/${p.goOs}-${p.goArch}/"
222222
include "${buildFileName}*"
223+
from "./"
224+
include "LICENSE.txt", "NOTICE.txt", "README.md"
225+
exclude "wski18n"
223226
}
224227
})
225228

0 commit comments

Comments
 (0)