From b9d75834173c291ebad2cc8d6306d7781b9ce27e Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Mon, 7 Feb 2022 20:34:14 +0000 Subject: [PATCH] fix(ci): run golangci-lint on integration tests - Use `Makefile` lint target - Add `--build-tags integration` to Makefile lint command - Add ` --timeout 10m` to Makefile lint command --- .github/workflows/checks.yml | 9 ++------- Makefile | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 504fbf1383..307068b38b 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -25,14 +25,9 @@ jobs: - uses: actions/setup-go@v2 with: go-version: "1.17.x" - - uses: actions/checkout@v2 - - - name: setup golangci-lint - run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | - sh -s -- -b $(go env GOPATH)/bin v1.43.0 - - run: golangci-lint run --timeout 10m + - name: Lint + run: make lint check-description: name: Checks PR has title and body description diff --git a/Makefile b/Makefile index d12d358db9..adbb395f86 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ help: Makefile .PHONY: lint lint: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0 - golangci-lint run + golangci-lint run --build-tags integration --timeout 10m clean: rm -fr ./bin