From ac991ebeaf4ab51c67eebdf0c9c0f87257833432 Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Thu, 15 Jun 2023 17:07:31 +0200 Subject: [PATCH] Use Golang 1.20 (#2205) * Upgrade to Golang 1.20. #2190 Signed-off-by: Israel Blancas * Upgrade golangci-lint Signed-off-by: Israel Blancas * Disable deepguard. It was not used before Signed-off-by: Israel Blancas --------- Signed-off-by: Israel Blancas --- .github/workflows/base-checks.yaml | 2 +- .github/workflows/release.yaml | 2 +- .golangci.yml | 5 ++--- Dockerfile | 2 +- Dockerfile.asserts | 2 +- go.mod | 2 +- hack/install/install-golangci-lint.sh | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/base-checks.yaml b/.github/workflows/base-checks.yaml index 7d7f86938..20e68dca3 100644 --- a/.github/workflows/base-checks.yaml +++ b/.github/workflows/base-checks.yaml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: "1.20" - name: Check out code into the Go module directory uses: actions/checkout@v3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cfbdb020c..2571d2ec0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: "1.20" - uses: actions/checkout@v3 diff --git a/.golangci.yml b/.golangci.yml index 84033167b..1c596c50d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,16 +1,15 @@ run: - go: '1.19' + go: '1.20' timeout: 10m linters-settings: goimports: local-prefixes: github.com/jaegertracing/jaeger-operator gosimple: - go: "1.19" + go: "1.20" linters: enable: - - depguard - gofmt - gofumpt - goimports diff --git a/Dockerfile b/Dockerfile index 56f875368..b564db5c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19 as builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/Dockerfile.asserts b/Dockerfile.asserts index d9107be02..d7278bbfe 100644 --- a/Dockerfile.asserts +++ b/Dockerfile.asserts @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19 as builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 as builder WORKDIR /workspace diff --git a/go.mod b/go.mod index 04a98d2c3..83b0bfc38 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jaegertracing/jaeger-operator -go 1.19 +go 1.20 require ( github.com/Masterminds/semver v1.5.0 diff --git a/hack/install/install-golangci-lint.sh b/hack/install/install-golangci-lint.sh index 7cd933c2a..3a3c4a758 100755 --- a/hack/install/install-golangci-lint.sh +++ b/hack/install/install-golangci-lint.sh @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="1.50.1" +VERSION="1.53.2" echo "Installing golangci-lint"