[GitHub] dubeejw closed pull request #201: Run Godep tool for build

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

dubeejw closed pull request #201: Run Godep tool for build
URL: https://github.com/apache/incubator-openwhisk-cli/pull/201
 
 
   

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 83200585..43786a56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ install:
   - go get -u github.com/golang/lint/golint
   - go get -u github.com/stretchr/testify
   - go get -u github.com/spf13/viper
+  - go get github.com/tools/godep
 
 script:
   - ./tools/travis/test_openwhisk.sh
@@ -48,6 +49,7 @@ before_deploy:
   - go get github.com/mattn/go-isatty
   - export build_file_name=wsk
   - export zip_file_name=OpenWhisk_CLI
+  - ./bin/godep restore -v
   - chmod +x tools/travis/build_tag_releases.sh
   - ./tools/travis/build_tag_releases.sh $build_file_name $zip_file_name
   - export RELEASE_PKG_FILE=$(ls $zip_file_name-*.*)
diff --git a/Makefile b/Makefile
index f9aec65e..eb63eae2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,15 @@ BUILD=`git rev-parse HEAD`
 
 deps:
 	@echo "Installing dependencies"
-	go get -d -t ./...
+	./bin/godep restore -v
+	# go get -d -t ./...
 
 LDFLAGS=-ldflags "-X main.CLI_BUILD_TIME=`date -u '+%Y-%m-%dT%H:%M:%S%:z'`"
 
-updatedeps:
-	@echo "Updating all dependencies"
-	@go get -d -u -f -fix -t ./...
+# Never want to do this ever
+# updatedeps:
+# @echo "Updating all dependencies"
+#	@go get -d -u -f -fix -t ./...
 
 # Build the project
 build: deps
@@ -49,4 +51,4 @@ install:
 clean:
 	if [ -f ${BINARY} ] ; then rm ${BINARY}; fi
 
-.PHONY: clean install
\ No newline at end of file
+.PHONY: clean install


 

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