This is an automated email from the ASF dual-hosted git repository.
mhamann pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-apigateway.git
The following commit(s) were added to refs/heads/master by this push:
new 46b36c8 Enable project scancode from utilties repo. (#241)
46b36c8 is described below
commit 46b36c8f1fcc9e6506ec1e574b5fb31031e33ee7
Author: Matt Rutkowski <[email protected]>
AuthorDate: Thu Jul 13 09:56:17 2017 -0500
Enable project scancode from utilties repo. (#241)
---
tools/travis/build.sh | 11 +++++++----
tools/travis/setup.sh | 5 ++++-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index fe80906..ebb0a66 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -3,11 +3,15 @@ set -e
set -x
# Build script for Travis-CI.
-
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
ROOTDIR="$SCRIPTDIR/../.."
+HOMEDIR="$ROOTDIR/.."
WHISKDIR="$ROOTDIR/../openwhisk"
+# run the scancode util. against project source code starting at its root
+cd $HOMEDIR
+incubator-openwhisk-utilities/scancode/scanCode.py $ROOTDIR
+
# Install OpenWhisk
cd $WHISKDIR/ansible
@@ -18,10 +22,10 @@ $ANSIBLE_CMD prereq.yml
$ANSIBLE_CMD couchdb.yml
$ANSIBLE_CMD initdb.yml
-#build docker image locally
+# build docker image locally
pushd $ROOTDIR
pwd
-docker build . -t "openwhisk/apigateway"
+docker build . -t "openwhisk/apigateway"
popd
#Use local
@@ -52,4 +56,3 @@ sleep 60
TERM=dumb ./gradlew tests:test --tests whisk.core.apigw.*
${WSK_TESTS_DEPS_EXCLUDE}
sleep 60
TERM=dumb ./gradlew tests:test --tests whisk.core.cli.test.ApiGwTests
${WSK_TESTS_DEPS_EXCLUDE}
-
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index ea3cbb7..84139c4 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -26,6 +26,9 @@ pip install --user ansible==2.3.0.0
sudo apt-get -y install nodejs npm
sudo npm install -g jshint
-# OpenWhisk stuff
+# clone OpenWhisk main repo.
cd $HOMEDIR
git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk
+
+# clone the openwhisk utilities repo.
+git clone https://github.com/apache/incubator-openwhisk-utilities.git
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
