[incubator-openwhisk] branch master updated: Reference scancode from utils repo. but preserve local copy (phase 1) (#2365)

[cs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 5f73e4f  Reference scancode from utils repo. but preserve local copy (phase 1) (#2365)
5f73e4f is described below

commit 5f73e4f00cb83a6d0280feabd03641f50a0c0e6f
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Fri Jun 23 16:14:11 2017 -0500

    Reference scancode from utils repo. but preserve local copy (phase 1) (#2365)
    
    * Reference scancode from utils repo. but preserve local copy (phase 1)
    
    * Update README to reflect relocation of scancode util.
---
 tools/build/README.md |  6 +++---
 tools/travis/build.sh | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/build/README.md b/tools/build/README.md
index 60532b1..0c369cb 100644
--- a/tools/build/README.md
+++ b/tools/build/README.md
@@ -1,11 +1,11 @@
 # Build helper scripts
 
 This directory contains the following utilities.
-- `scanCode.py`: checks all code for conformance with respect to certain conventions,
+- `scanCode.py`: checks all code for conformance with respect to certain conventions.
+   - Please note that this utility has been moved to the incubator-openwhisk-utilities repository so that all Apache OpenWhisk repositories may more easily reference it. This version will be removed once all other repositories in the project correctly reference it in its new location.
 - `redo`: a wrapper around Ansible and Gradle commands, for which examples are given below,
 - `citool`: allows for command line monitoring of Jenkins and Travis CI builds.
 
-
 ## How to use `redo`
 
 The script is called `redo` because for most development, one will want to "redo" the compilation and deployment.
@@ -30,7 +30,7 @@ For example, the following is handy to run a subset of all tests from the comman
 
   * `redo tests -a '--tests package.name.TestClass.evenMethodName'`
 
-## How to use `citool` 
+## How to use `citool`
 
 This script allows for monitoring of ongoing Jenkins and Travis builds.
 The script assumes by default that the monitored job is a Travis CI build hosted here `https://api.travis-ci.org/`.
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 4638951..9813c96 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -5,9 +5,14 @@ set -e
 
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../.."
+HOMEDIR="$SCRIPTDIR/../../../"
 
-cd $ROOTDIR
-tools/build/scanCode.py .
+# clone the openwhisk utilities repo.
+cd $HOMEDIR
+git clone https://github.com/apache/incubator-openwhisk-utilities.git
+
+# run the scancode util. against project source code starting at its root
+incubator-openwhisk-utilities/scancode/scanCode.py $ROOTDIR
 
 cd $ROOTDIR/ansible
 
@@ -23,7 +28,6 @@ $ANSIBLE_CMD apigateway.yml
 cd $ROOTDIR
 
 TERM=dumb ./gradlew distDocker -PdockerImagePrefix=testing $GRADLE_PROJS_SKIP
- 
 
 cd $ROOTDIR/ansible
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].