Skip to content

Commit e2cd8bc

Browse files
Non breaking upgrades getting ready for v2
1 parent 2773bb0 commit e2cd8bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1665
-1981
lines changed

.github/workflows/lint.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
if: ${{ inputs.lint_proto }}
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- uses: bufbuild/buf-setup-action@v1
2121
with:
2222
github_token: ${{ github.token }}
@@ -36,8 +36,9 @@ jobs:
3636
- uses: actions/checkout@v3
3737
- uses: actions/setup-go@v3
3838
with:
39-
go-version: '1.20'
39+
go-version: '1.23'
4040
check-latest: true
4141
- uses: golangci/golangci-lint-action@v3
4242
with:
43-
version: v1.54.2
43+
version: v1.61.0
44+
github-token: '${{ github.token }}'

.github/workflows/push.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ jobs:
2424
2525
lint:
2626
name: Lint
27-
needs:
28-
- changes
27+
needs: changes
2928
if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.generator == 'true' }}
3029
uses: ./.github/workflows/lint.yaml
3130
with:
@@ -41,19 +40,19 @@ jobs:
4140
if: ${{ needs.changes.outputs.generator == 'true' }}
4241
steps:
4342
- name: Checkout
44-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4544
with:
4645
fetch-depth: 0
4746
- name: Go Setup
48-
uses: actions/setup-go@v3
47+
uses: actions/setup-go@v5
4948
with:
50-
go-version: '1.20'
49+
go-version: '1.23'
5150
check-latest: true
5251
cache: true
5352
- name: Get version
5453
id: get_version
5554
run: |
56-
version=$(git describe --abbrev=0 --match "v*.*.*" || echo "v0.1.0")
55+
version=$(git describe --abbrev=0 --match "v*.*.*")
5756
echo ::set-output name=version::$version
5857
- name: Next Version
5958
uses: technicallyjosh/next-version-action@v1

.github/workflows/release.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ jobs:
2828
name: Release Proto
2929
runs-on: ubuntu-latest
3030
if: ${{ inputs.type == 'proto' || inputs.type == 'all' }}
31-
needs:
32-
- lint
31+
needs: lint
3332
steps:
3433
- name: Checkout
3534
uses: actions/checkout@v3
@@ -45,17 +44,16 @@ jobs:
4544
name: Release Generator
4645
runs-on: ubuntu-latest
4746
if: ${{ inputs.type == 'generator' || inputs.type == 'all' }}
48-
needs:
49-
- lint
47+
needs: lint
5048
steps:
5149
- name: Checkout
52-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5351
with:
5452
fetch-depth: 0
5553
- name: Go Setup
56-
uses: actions/setup-go@v4
54+
uses: actions/setup-go@v5
5755
with:
58-
go-version: '1.20'
56+
go-version: '1.23'
5957
check-latest: true
6058
- name: Get version
6159
id: get_version
@@ -72,7 +70,8 @@ jobs:
7270
uses: rickstaa/action-create-tag@v1
7371
with:
7472
tag: ${{ steps.version.outputs.next_version }}
75-
- uses: goreleaser/goreleaser-action@v4
73+
- name: Release
74+
uses: goreleaser/goreleaser-action@v4
7675
with:
7776
distribution: goreleaser
7877
version: latest

.golangci.yaml

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
1+
linters:
2+
enable:
3+
- errcheck
4+
- gosimple
5+
- govet
6+
- ineffassign
7+
- staticcheck
8+
- unused
9+
# added
10+
- errname
11+
- gofumpt
12+
- nlreturn
13+
- revive
14+
run:
15+
allow-parallel-runners: true
16+
concurrency: 2
17+
tests: true
18+
timeout: 2m
19+
linters-settings:
20+
revive:
21+
rules:
22+
- name: exported
23+
disabled: true
124
issues:
2-
exclude-rules:
3-
- linters:
4-
- staticcheck
5-
text: 'SA1019:'
25+
exclude-use-default: false
26+
exclude-dirs:
27+
- vendor
28+
output:
29+
formats:
30+
- format: colored-line-number

.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
changelog:
2-
skip: true
2+
disable: true

Dockerfile

Lines changed: 0 additions & 18 deletions
This file was deleted.

Taskfile.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
version: 3
22

33
vars:
4-
wd: /workspace
4+
WD: /workspace
5+
BUF_VERSION: 1.45
6+
BUF_COMMAND: docker run --rm -v "$(pwd):{{.WD}}" -w {{.WD}} bufbuild/buf:{{.BUF_VERSION}}
57

68
tasks:
79
default:
@@ -12,16 +14,16 @@ tasks:
1214
lint:
1315
summary: Lints Protobuf and Go.
1416
cmds:
15-
- docker run --rm -v "$(pwd):{{.wd}}" -w {{.wd}} bufbuild/buf:1.31 lint
17+
- '{{.BUF_COMMAND}} lint'
1618
- golangci-lint run ./...
1719

1820
test:
1921
summary: Tests the lib end to end.
2022
cmds:
21-
- go install .
22-
- go test -v ./...
23+
- go install ./cmd/protoc-gen-openapi
24+
- go test -v ./cmd/...
2325

2426
generate:
2527
summary: Generates Go from Protobuf.
2628
cmds:
27-
- docker run --rm -v "$(pwd):/{{.wd}}" -w {{.wd}} bufbuild/buf:1.31 generate
29+
- docker run --rm -v "$(pwd):{{.WD}}" -w {{.WD}} bufbuild/buf:{{.BUF_VERSION}} generate

api/buf.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)