From 93939a00f50baef9315f04b452f98949f09251df Mon Sep 17 00:00:00 2001 From: Arne Luenser Date: Wed, 28 Feb 2024 13:01:49 +0100 Subject: [PATCH] chore: bump golangci-lint (#1150) --- .github/workflows/ci.yml | 6 +++--- Makefile | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e3bc7271a..aba783a7d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,14 +42,14 @@ jobs: - name: Run nancy uses: sonatype-nexus-community/nancy-github-action@v1.0.2 - name: Run golangci-lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@v4 env: GOGC: 100 with: args: --timeout 10m0s - version: v1.52.2 - skip-go-installation: true + version: v1.56.2 skip-pkg-cache: true + skip-build-cache: true - name: Run go-acc (tests) run: | make .bin/go-acc diff --git a/Makefile b/Makefile index 3e9d2ef3f9..c39da0c5a7 100644 --- a/Makefile +++ b/Makefile @@ -33,15 +33,23 @@ node_modules: package-lock.json curl https://raw.githubusercontent.com/ory/meta/master/install.sh | bash -s -- -b .bin ory v0.2.2 touch .bin/ory +.bin/golangci-lint: Makefile + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -d -b .bin v1.56.2 + authors: # updates the AUTHORS file curl https://raw.githubusercontent.com/ory/ci/master/authors/authors.sh | env PRODUCT="Ory Oathkeeper" bash +.PHONY: format format: .bin/goimports .bin/ory node_modules .bin/ory dev headers copyright --type=open-source --exclude=internal/httpclient goimports -w --local github.com/ory . gofmt -l -s -w . npm exec -- prettier --write . +.PHONY: lint +lint: .bin/golangci-lint + .bin/golangci-lint run --timeout 10m0s + licenses: .bin/licenses node_modules # checks open-source licenses .bin/licenses