Skip to content

Commit 1411a19

Browse files
authored
Merge pull request #35 from oapi-codegen/chore/go124
chore: require Go 1.24, update CI to actions v0.8.0
2 parents e4ef9c9 + 54117b2 commit 1411a19

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ permissions:
77
contents: read
88
jobs:
99
build:
10-
uses: oapi-codegen/actions/.github/workflows/ci.yml@8ebfe4c83d051866a4af122ba602239fa3220e52 # v0.7.0
10+
uses: oapi-codegen/actions/.github/workflows/ci.yml@0b10ad68a53148bd29896be82ad92027b35507a3 # v0.8.0
1111
with:
12-
lint_versions: '["1.25"]'
12+
lint_versions: '["1.26"]'

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ help:
99
@echo " lint run linting"
1010

1111
$(GOBIN)/golangci-lint:
12-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.10.1
12+
curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b $(GOBIN) v2.12.2
1313

1414
.PHONY: tools
1515
tools: $(GOBIN)/golangci-lint
@@ -18,7 +18,7 @@ lint: tools
1818
git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && $(GOBIN)/golangci-lint run ./...'
1919

2020
lint-ci: tools
21-
git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && $(GOBIN)/golangci-lint run ./... --timeout=5m'
21+
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'
2222

2323
test:
2424
git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && go test -cover ./...'
@@ -27,6 +27,9 @@ tidy:
2727
@echo "tidy..."
2828
git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && go mod tidy'
2929

30+
tidy-ci:
31+
git ls-files go.mod '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && go mod tidy -diff'
32+
3033
# Empty rule to make CI logic happy
3134
.PHONY: generate
3235
generate: ;

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/oapi-codegen/nullable
22

3-
go 1.20
3+
go 1.24.0

‎internal/test/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/oapi-codegen/nullable/internal/test
22

3-
go 1.20
3+
go 1.24.0
44

55
replace github.com/oapi-codegen/nullable => ../../
66

0 commit comments

Comments
 (0)