Remove unused Godeps files; update README for Go Modules (#1114)

* Remove unused Godeps files; update README for Go Modules * Remove unused Godeps files; update README for Go Modules * Remove unused Godeps files; update README for Go Modules * Remove unused Godeps files; update README for Go Modules * Remove unused Godeps files; update README for Go Modules * Update README to include dependency mgmt using go get * Clean up Dockerfile from godeps commands * Remove godep from travis config
apache · Feb 17, 2021 · 7126d6c · 7126d6c
1 parent 7093f6c
commit 7126d6c
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 289 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -42,7 +42,6 @@ install:
   - export DEPLOY_BUILD_READY=false
   - go get -u golang.org/x/lint/golint
   - go get -u github.com/stretchr/testify
-  - go get -u github.com/tools/godep
 before_script:
   - GO_FILES=$(find . -iname '*.go' -type f -not -path "./wski18n/i18n_resources.go")
   - export BAD_GO=$(gofmt -s -l $(echo $GO_FILES))

diff --git a/Dockerfile b/Dockerfile
@@ -15,24 +15,16 @@
 # limitations under the License.
 #
 
-FROM golang:1.9
+FROM golang:1.15
 
 # Install zip
 RUN apt-get -y update && \
     apt-get -y install zip emacs
 
 ENV GOPATH=/
 
-# Download and install tools
-RUN echo "Installing the godep tool"
-RUN go get github.com/tools/godep
-
 ADD . /src/github.com/apache/openwhisk-wskdeploy
 
-# Load all of the dependencies from the previously generated/saved godep generated godeps.json file
-RUN echo "Restoring Go dependencies"
-RUN cd /src/github.com/apache/openwhisk-wskdeploy && /bin/godep restore -v
-
 # All of the Go CLI binaries will be placed under a build folder
 RUN rm -rf /src/github.com/apache/openwhisk-wskdeploy/build
 RUN mkdir /src/github.com/apache/openwhisk-wskdeploy/build

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/Makefile b/Makefile
@@ -26,13 +26,9 @@ BUILD=`git rev-parse HEAD`
 
 BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
 
-deps:
-	@echo "Installing dependencies"
-	godep restore -v
-
 LDFLAGS=-ldflags "-X main.Version=${VERSION} -X main.GitCommit=${BUILD} -X main.BuildDate=${BUILD_DATE} -X main.Build=`git rev-parse HEAD` "
 
-test: deps
+test:
 	@echo "Testing"
 	go test ./... -tags=unit