Skip to content

Commit 03ba16d

Browse files
authored
Merge pull request #334 from bookingcom/grzkv/upgrade_go_to_116
Upgraded go to 1.16
2 parents 758f4bc + 62d64c4 commit 03ba16d

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
test:
99
strategy:
1010
matrix:
11-
go-version: [1.14.x]
11+
go-version: [1.16.x]
1212
os: [ubuntu-latest]
1313
runs-on: ${{ matrix.os }}
1414
steps:
@@ -34,12 +34,9 @@ jobs:
3434
with:
3535
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
3636
version: v1.40.1
37-
3837
# Optional: working directory, useful for monorepos
3938
# working-directory: somedir
40-
4139
# Optional: golangci-lint command line arguments.
4240
#args: --new-from-rev=f7cdb31b6a6c8
43-
4441
# Optional: show only new issues if it's a pull request. The default value is `false`.
4542
# only-new-issues: true

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ endif
88
GO ?= go
99
VERSION ?= $(shell git rev-parse --short HEAD)
1010

11-
# Binaries
1211
PKG_CARBONAPI=github.com/bookingcom/carbonapi/cmd/carbonapi
1312
PKG_CARBONZIPPER=github.com/bookingcom/carbonapi/cmd/carbonzipper
1413

15-
# Flags
1614
GCFLAGS :=
1715
debug: GCFLAGS += -gcflags=all='-l -N'
1816

@@ -21,7 +19,8 @@ LDFLAGS = -ldflags '-X main.BuildVersion=$(VERSION)'
2119
TAGS := -tags cairo
2220
nocairo: TAGS =
2321

24-
# Targets
22+
### Targets ###
23+
2524
all: build
2625

2726
nocairo: build

docker/carbonapi/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14
1+
FROM golang:1.16
22

33
RUN apt-get update
44
RUN apt-get install -y libcairo2-dev

docker/nanotube/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14
1+
FROM golang:1.16
22

33
RUN go get github.com/bookingcom/nanotube/cmd/nanotube
44
RUN go install github.com/bookingcom/nanotube/cmd/nanotube

docker/zipper/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14
1+
FROM golang:1.16
22

33
RUN apt-get update
44
RUN apt-get install -y libcairo2-dev

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/bookingcom/carbonapi
22

3-
go 1.14
3+
go 1.16
44

55
require (
66
bitbucket.org/tebeka/strftime v0.0.0-20121209190902-af5e0ef38369

0 commit comments

Comments
 (0)