diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12111fa2a..c1d2fbac5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,8 +49,7 @@ jobs: if: matrix.os == 'ubuntu-20.04' uses: golangci/golangci-lint-action@v3 with: - version: v1.51 - args: --config=.golangci.yml --out-${NO_FUTURE}format colored-line-number + version: v1.52 - name: Test win if: matrix.os == 'windows-2022' diff --git a/Makefile b/Makefile index 17fbf9429..1208ada87 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ $(GOBINREL): $(GOBINREL)/protoc: | $(GOBINREL) $(eval PROTOC_TMP := $(shell mktemp -d)) - curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v22.1/protoc-22.1-$(PROTOC_OS)-$(ARCH).zip -o "$(PROTOC_TMP)/protoc.zip" + curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v22.2/protoc-22.2-$(PROTOC_OS)-$(ARCH).zip -o "$(PROTOC_TMP)/protoc.zip" cd "$(PROTOC_TMP)" && unzip protoc.zip cp "$(PROTOC_TMP)/bin/protoc" "$(GOBIN)" mkdir -p "$(PROTOC_INCLUDE)" @@ -80,7 +80,7 @@ lintci-deps-clean: golangci-lint-clean # download and build golangci-lint (https://golangci-lint.run) $(GOBINREL)/golangci-lint: | $(GOBINREL) - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(GOBIN)" v1.51.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(GOBIN)" v1.52.1 golangci-lint-clean: rm -f "$(GOBIN)/golangci-lint"