diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index a14762074..42a15406c 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -13,16 +13,6 @@ jobs: uses: actions/setup-go@v2 with: go-version: '1.17' - - name: Install golangci-lint - run: | - curl -sSLO https://github.com/golangci/golangci-lint/releases/download/v$GOLANGCI_LINT_VERSION/golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64.tar.gz - shasum -a 256 golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64.tar.gz | grep "^$GOLANGCI_LINT_SHA256 " > /dev/null - tar -xf golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64.tar.gz - sudo mv golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64/golangci-lint /usr/local/bin/golangci-lint - rm -rf golangci-lint-$GOLANGCI_LINT_VERSION-linux-amd64* - env: - GOLANGCI_LINT_VERSION: '1.43.0' - GOLANGCI_LINT_SHA256: 'f3515cebec926257da703ba0a2b169e4a322c11dc31a8b4656b50a43e48877f4' - name: Install revive run: | curl -sSLO https://github.com/mgechev/revive/releases/download/v${REVIVE_VERSION}/revive_${REVIVE_VERSION}_Linux_x86_64.tar.gz @@ -34,6 +24,6 @@ jobs: REVIVE_VERSION: '1.1.2' REVIVE_SHA256: 'f0ed25f61cf531e8023ae6b547731a1a75c5dedd2e8c9bd91da8f30103b7bdd2' - name: Test style - run: make test-style-revive || make test-style + run: make test-style - name: Run unit tests run: make test-coverage diff --git a/Makefile b/Makefile index 448050d35..779587093 100644 --- a/Makefile +++ b/Makefile @@ -113,11 +113,6 @@ test-coverage: .PHONY: test-style test-style: - GO111MODULE=on golangci-lint run - @scripts/validate-license.sh - -.PHONY: test-style-revive -test-style-revive: GO111MODULE=on revive ./... @scripts/validate-license.sh