[incubator-openwhisk-runtime-docker] branch master updated: Add scancode using ASF config. to Travis build. (#29)

[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-runtime-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new be67fe9  Add scancode using ASF config. to Travis build. (#29)
be67fe9 is described below

commit be67fe9fdb474eaba5387c28961d96a44c7eaf54
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Wed Apr 18 16:57:47 2018 -0500

    Add scancode using ASF config. to Travis build. (#29)
---
 tools/travis/build.sh | 9 +++++----
 tools/travis/setup.sh | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 355c9f8..1ae5b20 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -23,11 +23,16 @@ set -ex
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../.."
 WHISKDIR="$ROOTDIR/../openwhisk"
+UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities"
 
 export OPENWHISK_HOME=$WHISKDIR
 
 IMAGE_PREFIX="testing"
 
+# run scancode using the ASF Release configuration
+cd $UTILDIR
+scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
+
 # Build OpenWhisk
 cd $WHISKDIR
 
@@ -51,7 +56,3 @@ TERM=dumb ./gradlew \
 :core:actionProxy:distDocker \
 :sdk:docker:distDocker \
 -PdockerImagePrefix=${IMAGE_PREFIX}
-
-
-
-
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 1da8c03..3424cdb 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -24,9 +24,11 @@ SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../.."
 HOMEDIR="$SCRIPTDIR/../../../"
 
-# OpenWhisk stuff
+# clone OpenWhisk utilities repo. in order to run scanCode
 cd $HOMEDIR
+git clone https://github.com/apache/incubator-openwhisk-utilities.git
+
+# clone main openwhisk repo. for testing purposes
 git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk
 cd openwhisk
 ./tools/travis/setup.sh
-

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