diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml index b99f28c56e..e9ded1bb91 100644 --- a/.github/workflows/lint_and_test.yaml +++ b/.github/workflows/lint_and_test.yaml @@ -68,7 +68,6 @@ jobs: - name: Setup lint run: | make -f hack/Makefile golangci-lint - #curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2 - name: Lint run: | PATH=$PATH:$(go env GOPATH)/bin make check @@ -79,7 +78,7 @@ jobs: steps: - name: Self Hosted Runner Post Job Cleanup Action uses: TooMuch4U/actions-clean@v2.2 - + - name: Checkout uses: actions/checkout@v4 with: @@ -104,4 +103,4 @@ jobs: - name: Check for diff run: | git diff --exit-code --shortstat - + diff --git a/hack/Makefile b/hack/Makefile index d2de231042..65c028ebe2 100644 --- a/hack/Makefile +++ b/hack/Makefile @@ -10,7 +10,7 @@ else detected_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown') endif -deps := +deps := # TODO exact versions to compare gSED := $(shell (sed --version 2>/dev/null || echo 0.0) | head -n 1 | sed 's/.*(GNU sed) \([0-9\.]*\).*/\1/') ifeq ("v$(gSED)","v0.0") @@ -33,7 +33,7 @@ ifeq ("v$(JQ)","v0.0") deps += $(detected_OS)_jq endif -GOLANGCILINT_VERSION := "v1.54.2" +GOLANGCILINT_VERSION := "v1.58.1" GOLANGCILINTV := $(shell (golangci-lint --version 2>/dev/null || echo 0.0.0) | sed 's/.*v\([0-9\.]*\) .*/\1/') ifneq ("v$(GOLANGCILINTV)",$(GOLANGCILINT_VERSION)) deps += golangci-lint