Skip to content

Commit

Permalink
CI: Fix golangci linter failure (#1156)
Browse files Browse the repository at this point in the history
* CI: Fix golangci linter failure

* make CI use lint makefile commands

* uses -> run

* add back 1.20.x and 1.21.x for unit tests

* only do 1.21.x and 1.22.x versions

* setup go version with 1.22.x

* revert acceptance-test-pr

* revert test-schedule and release
  • Loading branch information
danaelhe committed May 9, 2024
1 parent 7ef4b10 commit 8ea164e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
# Runs `go vet` and unit tests.
strategy:
matrix:
go-version: [1.20.x, 1.21.x]
go-version: [1.21.x, 1.22.x]

runs-on: ubuntu-latest
steps:
Expand All @@ -29,9 +29,7 @@ jobs:
run: make vet

- name: Lint with golangci-lint
uses: golangci/golangci-lint-action@v3
with:
only-new-issues: true
run: make lint

- name: Run terrafmt
run: make terrafmt-check
Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ goimports:
@find . -name '*.go' | grep -v vendor | grep -v generator-resource-id | while read f; do goimports -w "$$f"; done

install-golangci-lint:
@go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
@go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2

lint: install-golangci-lint
@golangci-lint run -v ./...
Expand Down

0 comments on commit 8ea164e

Please sign in to comment.