diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9b67f9..739d63f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,6 @@ permissions: contents: read jobs: build: - uses: oapi-codegen/actions/.github/workflows/ci.yml@8ebfe4c83d051866a4af122ba602239fa3220e52 # v0.7.0 + uses: oapi-codegen/actions/.github/workflows/ci.yml@0b10ad68a53148bd29896be82ad92027b35507a3 # v0.8.0 with: - lint_versions: '["1.25"]' + lint_versions: '["1.26"]' diff --git a/Makefile b/Makefile index 92113d8..e7a8531 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ help: @echo " lint run linting" $(GOBIN)/golangci-lint: - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.10.1 + curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b $(GOBIN) v2.12.2 .PHONY: tools tools: $(GOBIN)/golangci-lint @@ -18,7 +18,7 @@ lint: tools git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && $(GOBIN)/golangci-lint run ./...' lint-ci: tools - git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && $(GOBIN)/golangci-lint run ./... --timeout=5m' + git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && $(GOBIN)/golangci-lint run ./... --output.text.path=stdout --timeout=5m' test: git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && go test -cover ./...' @@ -27,6 +27,9 @@ tidy: @echo "tidy..." git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && go mod tidy' +tidy-ci: + git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && go mod tidy -diff' + # Empty rule to make CI logic happy .PHONY: generate generate: ; diff --git a/go.mod b/go.mod index 99b48c1..d148979 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/oapi-codegen/nullable -go 1.20 +go 1.24.0 diff --git a/internal/test/go.mod b/internal/test/go.mod index 67ee0a0..ef9d75b 100644 --- a/internal/test/go.mod +++ b/internal/test/go.mod @@ -1,6 +1,6 @@ module github.com/oapi-codegen/nullable/internal/test -go 1.20 +go 1.24.0 replace github.com/oapi-codegen/nullable => ../../