Update Travis to use Scandcode with the ASF Release configuration. (#278)

mrutkows · pritidesai · commit 955f84e56341 · 2018-04-27T10:07:22.000-07:00
* Update Travis to use Scandcode with the ASF Release configuration.

* Update Travis to use Scandcode with the ASF Release configuration.

* Update Travis to use Scandcode with the ASF Release configuration.

* Update Travis to use Scandcode with the ASF Release configuration.
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
@@ -59,9 +59,17 @@ OPENWHISK_HOME="$( cd "${OPENWHISK_HOME:-$HOMEDIR/incubator-openwhisk}" && pwd )
 export OPENWHISK_HOME
 
 #
-#  Perform code validation using scanCode and Golint
+#  Run scancode using the ASF Release configuration
 #
-../incubator-openwhisk-utilities/scancode/scanCode.py $TRAVIS_BUILD_DIR
+UTILDIR="$( cd "${UTILDIR:-$HOMEDIR/incubator-openwhisk-utilities}" && pwd )"
+export UTILDIR
+cd $UTILDIR
+scancode/scanCode.py --config scancode/ASF-Release.cfg $TRAVIS_BUILD_DIR
+
+#
+#  Run Golint
+#
+cd $TRAVIS_BUILD_DIR
 ./gradlew --console=plain goLint
 
 #

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,17 @@ OPENWHISK_HOME="$( cd "${OPENWHISK_HOME:-$HOMEDIR/incubator-openwhisk}" && pwd )`
`59`	`59`	`export OPENWHISK_HOME`
`60`	`60`
`61`	`61`	`#`
`62`		`-# Perform code validation using scanCode and Golint`
	`62`	`+# Run scancode using the ASF Release configuration`
`63`	`63`	`#`
`64`		`-../incubator-openwhisk-utilities/scancode/scanCode.py $TRAVIS_BUILD_DIR`
	`64`	`+UTILDIR="$( cd "${UTILDIR:-$HOMEDIR/incubator-openwhisk-utilities}" && pwd )"`
	`65`	`+export UTILDIR`
	`66`	`+cd $UTILDIR`
	`67`	`+scancode/scanCode.py --config scancode/ASF-Release.cfg $TRAVIS_BUILD_DIR`
	`68`	`+`
	`69`	`+#`
	`70`	`+# Run Golint`
	`71`	`+#`
	`72`	`+cd $TRAVIS_BUILD_DIR`
`65`	`73`	`./gradlew --console=plain goLint`
`66`	`74`
`67`	`75`	`#`