Skip to content

Commit 52c21bd

Browse files
Merge pull request #25 from mail-ru-im/update-ci
ci: update go version
2 parents 1d6c376 + 4c3f318 commit 52c21bd

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/golang:1.12
5+
- image: circleci/golang:1.16
66
steps:
77
- checkout
88
- run: make test
99
lint:
1010
docker:
11-
- image: circleci/golang:1.15
11+
- image: circleci/golang:1.16
1212
steps:
1313
- checkout
1414
- run: make lint

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
all: generate test
22

3+
GOPATH := $(shell go env GOPATH)
4+
35
$(GOPATH)/bin/easyjson:
4-
go build -o $(GOPATH)/bin/easyjson github.com/mailru/easyjson/easyjson
6+
go build -mod mod -o $(GOPATH)/bin/easyjson github.com/mailru/easyjson/easyjson
57

68
$(GOPATH)/bin/golangci-lint:
7-
go build -o $(GOPATH)/bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
9+
go build -mod mod -o $(GOPATH)/bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
810

911
.PHONY: test
1012
test:
1113
go test -v --cover -coverprofile=cover.out ./...
1214

1315
.PHONY: lint
1416
lint: $(GOPATH)/bin/golangci-lint
15-
golangci-lint run
17+
$(GOPATH)/bin/golangci-lint run
1618

1719
.PHONY: generate
1820
generate: $(GOPATH)/bin/easyjson

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
1010
github.com/sirupsen/logrus v1.8.1
1111
github.com/stretchr/testify v1.7.0
12-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
12+
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect
1313
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
1414
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
1515
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
2121
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
2222
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2323
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
24-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
25-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
24+
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8=
25+
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2626
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2727
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
2828
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)