[GitHub] houshengbo closed pull request #875: Add scancode using ASF config. to Travis build.

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

houshengbo closed pull request #875: Add scancode using ASF config. to Travis build.
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/875
 
 
   

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/tools/travis/cloneutils.sh b/tools/travis/cloneutils.sh
index e91d3e91..51c2b7ce 100755
--- a/tools/travis/cloneutils.sh
+++ b/tools/travis/cloneutils.sh
@@ -24,6 +24,6 @@ set -o xtrace
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 HOMEDIR="$SCRIPTDIR/../../../"
 
-# clone OpenWhisk repo. in order to run scanCode.py
+# clone OpenWhisk utilities repo. in order to run scanCode
 cd $HOMEDIR
 git clone https://github.com/apache/incubator-openwhisk-utilities.git
diff --git a/tools/travis/scancode.sh b/tools/travis/scancode.sh
index 69f1ceee..17c9bdec 100755
--- a/tools/travis/scancode.sh
+++ b/tools/travis/scancode.sh
@@ -24,8 +24,8 @@ set -e
 # Build script for Travis-CI.
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../.."
-UTIL_DIR="$ROOTDIR/../incubator-openwhisk-utilities"
+UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities"
 
-# run scancode
-cd $UTIL_DIR
-scancode/scanCode.py $ROOTDIR
+# run scancode using the ASF Release configuration
+cd $UTILDIR
+scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR


 

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