From eab743129c039427707509c517329c3bb4bbe589 Mon Sep 17 00:00:00 2001 From: SeanCondon Date: Wed, 12 Oct 2022 17:50:40 +0100 Subject: [PATCH 1/2] bumping golangci-lint to 1.50.0 to work with go 1.19 --- make/onf-common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/onf-common.mk b/make/onf-common.mk index 350de7a..add0393 100644 --- a/make/onf-common.mk +++ b/make/onf-common.mk @@ -24,7 +24,7 @@ jenkins-tools: # @HELP installs tooling needed for Jenkins cd .. && go install github.com/jstemmer/go-junit-report@v1.0.0 && go install github.com/t-yuki/gocover-cobertura@master golang-ci: # @HELP install golang-ci if not present - golangci-lint --version || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v1.45.2 + golangci-lint --version || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v1.50.0 reuse-tool: # @HELP install reuse if not present command -v reuse || python3 -m pip install --user reuse From 594bbcfc268b90256e2b17fb59c80587ce8c8d88 Mon Sep 17 00:00:00 2001 From: SeanCondon Date: Wed, 12 Oct 2022 20:49:41 +0100 Subject: [PATCH 2/2] updating Dockerfiles --- .golangci.yml | 1 + VERSION | 2 +- build/golang-build/Dockerfile | 2 +- build/protoc-go/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 6c3a5ef..870c4d3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -20,3 +20,4 @@ issues: - Error return value of `.*Close` is not checked - Error return value of `.*Flush` is not checked - Error return value of `.*Write` is not checked + - "package-comments: should have a package comment" diff --git a/VERSION b/VERSION index c9a5712..f0bb29e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.2-dev +1.3.0 diff --git a/build/golang-build/Dockerfile b/build/golang-build/Dockerfile index bac6803..955c931 100644 --- a/build/golang-build/Dockerfile +++ b/build/golang-build/Dockerfile @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.18.1 +FROM golang:1.19.0 COPY dep-*.sha256 . diff --git a/build/protoc-go/Dockerfile b/build/protoc-go/Dockerfile index 1cca904..bd86e48 100644 --- a/build/protoc-go/Dockerfile +++ b/build/protoc-go/Dockerfile @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.18.1 +FROM golang:1.19.0 RUN apt-get update && \ apt-get install -y unzip python3 python3-pip