[GitHub] houshengbo closed pull request #39: Add scancode to Travis using the ASF Release configuration.

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

houshengbo closed pull request #39: Add scancode to Travis using the ASF Release configuration.
URL: https://github.com/apache/incubator-openwhisk-runtime-nodejs/pull/39
 
 
   

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/core/nodejs8Action/build.gradle b/core/nodejs8Action/build.gradle
index f796acb..b4dd28a 100644
--- a/core/nodejs8Action/build.gradle
+++ b/core/nodejs8Action/build.gradle
@@ -33,4 +33,4 @@ task cleanup(type: Delete) {
     delete 'app.js'
     delete 'runner.js'
     delete 'src'
-}
\ No newline at end of file
+}
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 19ea582..f952128 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
 
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 1da8c03..c74fad6 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 repo. in order to run scanCode.py
 cd $HOMEDIR
+git clone https://github.com/apache/incubator-openwhisk-utilities.git
+
+# OpenWhisk stuff
 git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk
 cd openwhisk
 ./tools/travis/setup.sh
-


 

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