You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mr...@apache.org on 2018/01/22 17:32:30 UTC

[incubator-openwhisk-wskdeploy] branch master updated: Update the installation of dependencies based on godep (#689)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ab223fe  Update the installation of dependencies based on godep (#689)
ab223fe is described below

commit ab223fee5ef788002ae8c5badd81d64b5fe70692
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Mon Jan 22 12:32:27 2018 -0500

    Update the installation of dependencies based on godep (#689)
---
 .travis.yml | 1 +
 Makefile    | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a364335..f297d3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ install:
 - export DEPLOY_BUILD_READY=false
 - go get -u github.com/golang/lint/golint
 - go get -u github.com/stretchr/testify
+- go get -u github.com/tools/godep
 script:
 - echo $TRAVIS
 - echo $TRAVIS_PULL_REQUEST
diff --git a/Makefile b/Makefile
index 25cab45..2256f4b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,16 +9,10 @@ BUILD=`git rev-parse HEAD`
 
 deps:
 	@echo "Installing dependencies"
-	go get -d -t ./...
-
+	godep restore -v
 
 LDFLAGS=-ldflags "-X main.Version=`date -u '+%Y-%m-%dT%H:%M:%S'` -X main.Build=`git rev-parse HEAD` "
 
-updatedeps:
-	@echo "Updating all dependencies"
-	@go get -d -u -f -fix -t ./...
-
-
 test: deps
 	@echo "Testing"
 	go test ./... -tags=unit

-- 
To stop receiving notification emails like this one, please contact
mrutkowski@apache.org.