diff --git a/.circleci/config.yml b/.circleci/config.yml index 615769bc..bd19887a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/golang:1.12 + - image: circleci/golang:1.14 steps: - checkout - run: @@ -10,4 +10,4 @@ jobs: command: make test - run: name: "Build" - command: make build \ No newline at end of file + command: make build diff --git a/Makefile b/Makefile index 03879971..98467206 100644 --- a/Makefile +++ b/Makefile @@ -9,24 +9,23 @@ # go build -o $(BINARY) command/* .PHONY: build - -GOPATH?=$(shell go env GOPATH) -GO111MODULE=auto - build: build-deps go build -mod=vendor -o pd ./command + +.PHONY: build-deps build-deps: go get go mod verify go mod vendor +.PHONY: install install: build - cp pd $(GOPATH)/bin + cp pd $(GOROOT)/bin .PHONY: test test: go test ./... +.PHONY: deploy deploy: - curl -sL https://git.io/goreleaser | bash - diff --git a/go.mod b/go.mod index 017ff18f..7b9c8025 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/PagerDuty/go-pagerduty -go 1.12 +go 1.14 require ( github.com/google/go-querystring v1.0.0