Skip to content

Commit

Permalink
chore: bump golangci-lint (#1150)
Browse files Browse the repository at this point in the history
  • Loading branch information
alnr authored Feb 28, 2024
1 parent 1ee445d commit 93939a0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 93939a0

Please sign in to comment.