From c07f9ec62e5b0a108650210e5a8720fa7ce4bdc4 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Sun, 23 Oct 2022 17:51:23 +0200 Subject: [PATCH] build: use go 1.19 for testing & release builds New docker image since the old one was deprecated, according to https://discuss.circleci.com/t/go-lang-docker-image-circleci-golang-1-19-is-missing/44961 --- .circleci/config.yml | 12 ++++++------ Makefile | 2 +- build/go.sum | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b15898..e2b4cb0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -150,7 +150,7 @@ parameters: release_docker_baseimage_tag: type: string - default: "1.17" + default: "1.19" workflows: version: 2 @@ -160,15 +160,15 @@ workflows: jobs: - quickcheck-docs - quickcheck-go: &quickcheck-go-smoketest - name: quickcheck-go-amd64-linux-1.17 - goversion: &latest-go-release "1.17" + name: quickcheck-go-amd64-linux-1.19 + goversion: &latest-go-release "1.19" goos: linux goarch: amd64 - test-go-on-latest-go-release: goversion: *latest-go-release - quickcheck-go: requires: - - quickcheck-go-amd64-linux-1.17 #quickcheck-go-smoketest.name + - quickcheck-go-amd64-linux-1.19 #quickcheck-go-smoketest.name matrix: &quickcheck-go-matrix alias: quickcheck-go-matrix parameters: @@ -249,7 +249,7 @@ jobs: goarch: type: string docker: - - image: circleci/golang:<> + - image: cimg/go:<> environment: GOOS: <> GOARCH: <> @@ -286,7 +286,7 @@ jobs: goversion: type: string docker: - - image: circleci/golang:<> + - image: cimg/go:<> steps: - checkout - restore-cache-gomod diff --git a/Makefile b/Makefile index 50ad570..8264ce9 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ GO_BUILDFLAGS := $(GO_MOD_READONLY) $(GO_EXTRA_BUILDFLAGS) GO_BUILD := $(GO_ENV_VARS) $(GO) build $(GO_BUILDFLAGS) -ldflags $(GO_LDFLAGS) GOLANGCI_LINT := golangci-lint GOCOVMERGE := gocovmerge -RELEASE_DOCKER_BASEIMAGE_TAG ?= 1.17 +RELEASE_DOCKER_BASEIMAGE_TAG ?= 1.19 RELEASE_DOCKER_BASEIMAGE ?= golang:$(RELEASE_DOCKER_BASEIMAGE_TAG) ifneq ($(GOARM),) diff --git a/build/go.sum b/build/go.sum index 9f46089..3a2744d 100644 --- a/build/go.sum +++ b/build/go.sum @@ -1733,6 +1733,7 @@ google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5 google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=