mrutkows closed pull request #689: Update the installation of dependencies
based on godep
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/689
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/.travis.yml b/.travis.yml
index a364335c..f297d3ca 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 25cab45f..2256f4b3 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
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
