Skip to content

Commit

Permalink
Merge pull request #212 from chenrui333/go-1.14
Browse files Browse the repository at this point in the history
Bump golang to v1.14
  • Loading branch information
Scott McAllister authored May 15, 2020
2 parents 0aa3df3 + d642ef6 commit cf8dedc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ version: 2
jobs:
build:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.14
steps:
- checkout
- run:
name: "Test"
command: make test
- run:
name: "Build"
command: make build
command: make build
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit cf8dedc

Please sign in to comment.