Skip to content

Commit

Permalink
Merge pull request #334 from bookingcom/grzkv/upgrade_go_to_116
Browse files Browse the repository at this point in the history
Upgraded go to 1.16
  • Loading branch information
grzkv authored Jun 11, 2021
2 parents 758f4bc + 62d64c4 commit 03ba16d
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.14.x]
go-version: [1.16.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -34,12 +34,9 @@ jobs:
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.40.1

# Optional: working directory, useful for monorepos
# working-directory: somedir

# Optional: golangci-lint command line arguments.
#args: --new-from-rev=f7cdb31b6a6c8

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ endif
GO ?= go
VERSION ?= $(shell git rev-parse --short HEAD)

# Binaries
PKG_CARBONAPI=github.com/bookingcom/carbonapi/cmd/carbonapi
PKG_CARBONZIPPER=github.com/bookingcom/carbonapi/cmd/carbonzipper

# Flags
GCFLAGS :=
debug: GCFLAGS += -gcflags=all='-l -N'

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

# Targets
### Targets ###

all: build

nocairo: build
Expand Down
2 changes: 1 addition & 1 deletion docker/carbonapi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14
FROM golang:1.16

RUN apt-get update
RUN apt-get install -y libcairo2-dev
Expand Down
2 changes: 1 addition & 1 deletion docker/nanotube/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14
FROM golang:1.16

RUN go get github.com/bookingcom/nanotube/cmd/nanotube
RUN go install github.com/bookingcom/nanotube/cmd/nanotube
Expand Down
2 changes: 1 addition & 1 deletion docker/zipper/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14
FROM golang:1.16

RUN apt-get update
RUN apt-get install -y libcairo2-dev
Expand Down
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/bookingcom/carbonapi

go 1.14
go 1.16

require (
bitbucket.org/tebeka/strftime v0.0.0-20121209190902-af5e0ef38369
Expand Down

0 comments on commit 03ba16d

Please sign in to comment.