Merge pull request #172 from dineshba/mod

Change makefiles and readme
PagerDuty · Nov 10, 2019 · e96b2a1 · e96b2a1
2 parents 94ee1c5 + 2dbe542
commit e96b2a1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,9 +3,8 @@ jobs:
   build:
     docker:
       - image: circleci/golang:1.12
-    working_directory: /go/src/github.com/PagerDuty/go-pagerduty
     steps:
       - checkout
       - run:
           name: "Build"
-          command: make build
+          command: make build
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 bin/*
 *.swp
+pd
+vendor/
diff --git a/Makefile b/Makefile
@@ -9,10 +9,19 @@
 # 	go build -o $(BINARY) command/*
 
 .PHONY: build
-build:
-	go get ./...
-	# go test -v -race -cover ./...
-	# go tool vet $(SOURCES)
+
+GOPATH?=$(shell go env GOPATH)
+GO111MODULE=auto
+
+build: build-deps
+	go build -mod=vendor -o pd ./command
+build-deps:
+	go get
+	go mod verify
+	go mod vendor
+
+install: build
+	cp pd $(GOPATH)/bin
 
 .PHONY: test
 test:

diff --git a/README.md b/README.md
@@ -13,12 +13,7 @@ go get github.com/PagerDuty/go-pagerduty
 Next build the application.
 ```cli
 cd $GOPATH/src/github.com/PagerDuty/go-pagerduty
-go build -o $GOPATH/bin/pd command/*
-```
-If you do not have the dependencies necessary to build the project, run this in the project root and try again
-
-```cli
-go get ./...
+make install
 ```
 
 ## Usage
-Original file line number
+Diff line change
@@ -1,2 +1,4 @@
     bin/*
     *.swp
+    pd
+    vendor/