From 7b131693b31daf516d1dd16c3de3f446fdcc3bde Mon Sep 17 00:00:00 2001 From: dntosas Date: Fri, 10 Feb 2023 11:10:54 +0200 Subject: [PATCH] [golang] Bump to version 1.20 Signed-off-by: dntosas --- .github/workflows/ci.yml | 4 ++-- .github/workflows/go-release.yml | 2 +- Makefile | 6 +++--- charts/capi2argo-cluster-operator/Chart.yaml | 2 +- charts/capi2argo-cluster-operator/values.yaml | 2 +- go.mod | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43d62d53..6eccdeb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3.5.0 with: - go-version: 1.19 + go-version: '1.20.1' - name: Checkout code uses: actions/checkout@v3.3.0 @@ -31,7 +31,7 @@ jobs: - name: Run go lint uses: golangci/golangci-lint-action@v3 with: - version: v1.50.1 + version: v1.51.1 args: --timeout 5m --enable revive,gofmt,exportloopref --exclude-use-default=false --modules-download-mode=vendor --build-tags integration - name: Run go test diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml index 47647ca5..37249987 100644 --- a/.github/workflows/go-release.yml +++ b/.github/workflows/go-release.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3.5.0 with: - go-version: 1.19 + go-version: '1.20.1' - name: Checkout code uses: actions/checkout@v3.3.0 diff --git a/Makefile b/Makefile index 7dfdd8b6..c30caecc 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ USER = $(shell id -u) GROUP = $(shell id -g) PROJECT = "capi2argo-cluster-operator" GOBUILD_OPTS = -ldflags="-s -w -X ${PROJECT}/cmd.Version=${VERSION} -X ${PROJECT}/cmd.CommitHash=${COMMIT}" -GO_IMAGE = "golang:1.19-alpine" -GO_IMAGE_CI = "golangci/golangci-lint:v1.50.1" +GO_IMAGE = "golang:1.20-alpine" +GO_IMAGE_CI = "golangci/golangci-lint:v1.51.1" DISTROLESS_IMAGE = "gcr.io/distroless/static:nonroot" IMAGE_TAG_BASE ?= "ghcr.io/dntosas/${PROJECT}" @@ -39,7 +39,7 @@ vet: ## Run go vet against code. .PHONY: lint lint: ## Run golangci-lint against code. - golangci-lint run --enable revive,gofmt,exportloopref --exclude-use-default=false --modules-download-mode=vendor --build-tags integration + @docker run --rm --volume "${PWD}:/app" -w /app "${GO_IMAGE_CI}" golangci-lint run --enable revive,gofmt,exportloopref --exclude-use-default=false --modules-download-mode=vendor --build-tags integration .PHONY: test test: envtest ## Run go tests against code. diff --git a/charts/capi2argo-cluster-operator/Chart.yaml b/charts/capi2argo-cluster-operator/Chart.yaml index c384e0ed..460d481b 100644 --- a/charts/capi2argo-cluster-operator/Chart.yaml +++ b/charts/capi2argo-cluster-operator/Chart.yaml @@ -11,7 +11,7 @@ maintainers: name: capi2argo-cluster-operator sources: - https://github.com/dntosas/capi2argo-cluster-operator -version: 0.1.9 +version: 0.1.10 dependencies: - name: common repository: "https://charts.bitnami.com/bitnami" diff --git a/charts/capi2argo-cluster-operator/values.yaml b/charts/capi2argo-cluster-operator/values.yaml index f5a84a71..dcae389a 100644 --- a/charts/capi2argo-cluster-operator/values.yaml +++ b/charts/capi2argo-cluster-operator/values.yaml @@ -12,7 +12,7 @@ replicaCount: 1 image: registry: ghcr.io repository: dntosas/capi2argo-cluster-operator - tag: v0.1.9 + tag: v0.1.10 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/go.mod b/go.mod index 226add13..4cad3250 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/dntosas/capi2argo-cluster-operator -go 1.19 +go 1.20 require ( github.com/go-logr/logr v1.2.3