From 9ac71212d0b5c38a699d2d36fdce827c94d1eeaf Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sat, 25 Mar 2023 01:51:02 -0400 Subject: [PATCH] Skip linting on Go tip Signed-off-by: Yuri Shkuro --- .github/workflows/ci-unit-tests-go-tip.yml | 3 +++ .github/workflows/ci-unit-tests.yml | 3 +++ Makefile | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-unit-tests-go-tip.yml b/.github/workflows/ci-unit-tests-go-tip.yml index 53994f5f4a7..c2077709b49 100644 --- a/.github/workflows/ci-unit-tests-go-tip.yml +++ b/.github/workflows/ci-unit-tests-go-tip.yml @@ -35,3 +35,6 @@ jobs: - name: Run unit tests run: make test-ci + + - name: Lint + run: echo skip linting on Go tip diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml index e822ceb7f43..4e419bc51d3 100644 --- a/.github/workflows/ci-unit-tests.yml +++ b/.github/workflows/ci-unit-tests.yml @@ -46,3 +46,6 @@ jobs: flags: unittests fail_ci_if_error: true token: ${{ env.CODECOV_TOKEN }} + + - name: Lint + run: make lint diff --git a/Makefile b/Makefile index 407aba9299d..7eb51691281 100644 --- a/Makefile +++ b/Makefile @@ -394,14 +394,14 @@ draft-release: .PHONY: install-tools install-tools: $(GO) install github.com/vektra/mockery/v2@v2.14.0 - $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2 + $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.1 $(GO) install mvdan.cc/gofumpt@latest .PHONY: install-ci install-ci: install-tools .PHONY: test-ci -test-ci: build-examples cover lint +test-ci: build-examples cover .PHONY: thrift thrift: idl/thrift/jaeger.thrift thrift-image