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

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

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

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/build.sh b/tools/travis/build.sh
index 8b88fcdc..5ca2ad3a 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -21,8 +21,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
\ No newline at end of file
+# run scancode using the ASF Release configuration
+cd $UTILDIR
+scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index cbdddbc3..d539738a 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -19,6 +19,6 @@
 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


 

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