From 51e2ae785ceba1a2a2935956103b9d3e5661adc8 Mon Sep 17 00:00:00 2001 From: Vince Prignano Date: Tue, 11 Apr 2023 16:57:48 -0700 Subject: [PATCH] Use Go 1.19 in golangci-lint action Signed-off-by: Vince Prignano --- .github/workflows/golangci-lint.yml | 4 ++++ Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 80c2cd3689..d79667ed25 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -14,6 +14,10 @@ jobs: - "" - tools/setup-envtest steps: + - uses: actions/setup-go@v4 + with: + go-version: '1.19' + cache: false - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/Makefile b/Makefile index e7e167d10b..71ec644de0 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ $(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder. $(GOLANGCI_LINT): .github/workflows/golangci-lint.yml # Download golanci-lint using hack script into tools folder. hack/ensure-golangci-lint.sh \ -b $(TOOLS_BIN_DIR) \ - $(shell cat .github/workflows/golangci-lint.yml | grep version | sed 's/.*version: //') + $(shell cat .github/workflows/golangci-lint.yml | grep "version: v" | sed 's/.*version: //') ## -------------------------------------- ## Linting