Skip to content

Commit 4bad0ae

Browse files
committed
Merge remote-tracking branch 'origin/leafty/build-upgrade-codegen' into leafty/build-upgrade-echo-v5
2 parents 023989e + 75067cf commit 4bad0ae

7 files changed

Lines changed: 207 additions & 119 deletions

File tree

.github/workflows/ci.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,25 @@ jobs:
2424
format: golang
2525
continue-on-error: true
2626

27+
test-generate:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- name: Checkout
31+
uses: actions/checkout@v6
32+
- name: Install Go
33+
uses: actions/setup-go@v6
34+
with:
35+
go-version: 1.25
36+
- name: Build gateway
37+
run: |
38+
make build
39+
- name: Test code generation
40+
run: |
41+
make clean
42+
make cleanup-generate
43+
make internal/login/spec.gen.go
44+
make build
45+
2746
publish-images:
2847
runs-on: ubuntu-latest
2948
needs:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY go.mod go.sum ./
44
RUN go mod download
55
COPY cmd/gateway cmd/gateway
66
COPY internal internal
7-
RUN go build -o /gateway github.com/SwissDataScienceCenter/renku-gateway/cmd/gateway
7+
RUN go build -o /gateway github.com/SwissDataScienceCenter/renku-gateway/cmd/gateway
88

99
FROM alpine:3.21
1010
USER 1000:1000

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ internal/login/spec.gen.go: apispec.yaml
2020

2121
format:
2222
gofmt -l -w cmd internal
23+
24+
.PHONY: cleanup-generate
25+
cleanup-generate: ## Remove generated files
26+
rm internal/login/spec.gen.go || true

go.mod

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.25.5
55
tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
66

77
require (
8-
github.com/getkin/kin-openapi v0.133.0
98
github.com/getsentry/sentry-go v0.45.1
109
github.com/getsentry/sentry-go/echo v0.45.1
1110
github.com/go-jose/go-jose/v4 v4.1.4
@@ -16,24 +15,23 @@ require (
1615
github.com/labstack/echo-contrib/v5 v5.0.1
1716
github.com/labstack/echo/v5 v5.1.0
1817
github.com/mitchellh/mapstructure v1.5.0
19-
github.com/oapi-codegen/runtime v1.4.0
2018
github.com/oklog/ulid/v2 v2.1.1
21-
github.com/posthog/posthog-go v1.11.2
19+
github.com/posthog/posthog-go v1.11.3
2220
github.com/redis/go-redis/v9 v9.18.0
2321
github.com/spf13/viper v1.21.0
2422
github.com/stretchr/testify v1.11.1
25-
github.com/zitadel/oidc/v3 v3.45.3
23+
github.com/zitadel/oidc/v3 v3.47.5
2624
golang.org/x/oauth2 v0.36.0
2725
)
2826

2927
require (
30-
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
3128
github.com/beorn7/perks v1.0.1 // indirect
3229
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3330
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3431
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
3532
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
3633
github.com/fsnotify/fsnotify v1.9.0 // indirect
34+
github.com/getkin/kin-openapi v0.137.0 // indirect
3735
github.com/go-logr/logr v1.4.3 // indirect
3836
github.com/go-logr/stdr v1.2.2 // indirect
3937
github.com/go-openapi/jsonpointer v0.22.4 // indirect
@@ -44,13 +42,15 @@ require (
4442
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
4543
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
4644
github.com/josharian/intern v1.0.0 // indirect
45+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
4746
github.com/mailru/easyjson v0.9.1 // indirect
47+
github.com/mattn/go-colorable v0.1.14 // indirect
4848
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
4949
github.com/muhlemmer/gu v0.3.1 // indirect
5050
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
51-
github.com/oapi-codegen/oapi-codegen/v2 v2.6.0 // indirect
52-
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
53-
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
51+
github.com/oapi-codegen/oapi-codegen/v2 v2.7.0 // indirect
52+
github.com/oasdiff/yaml v0.0.9 // indirect
53+
github.com/oasdiff/yaml3 v0.0.12 // indirect
5454
github.com/onsi/gomega v1.38.2 // indirect
5555
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
5656
github.com/perimeterx/marshmallow v1.1.5 // indirect
@@ -60,32 +60,32 @@ require (
6060
github.com/prometheus/common v0.67.5 // indirect
6161
github.com/prometheus/procfs v0.19.2 // indirect
6262
github.com/sagikazarmark/locafero v0.12.0 // indirect
63-
github.com/sirupsen/logrus v1.9.3 // indirect
64-
github.com/speakeasy-api/jsonpath v0.6.0 // indirect
65-
github.com/speakeasy-api/openapi-overlay v0.10.2 // indirect
63+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
64+
github.com/sirupsen/logrus v1.9.4 // indirect
65+
github.com/speakeasy-api/jsonpath v0.6.3 // indirect
66+
github.com/speakeasy-api/openapi v1.19.2 // indirect
6667
github.com/spf13/afero v1.15.0 // indirect
6768
github.com/spf13/cast v1.10.0 // indirect
6869
github.com/spf13/pflag v1.0.10 // indirect
6970
github.com/subosito/gotenv v1.6.0 // indirect
71+
github.com/ugorji/go/codec v1.2.12 // indirect
7072
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
7173
github.com/woodsbury/decimal128 v1.4.0 // indirect
72-
github.com/zitadel/logging v0.6.2 // indirect
74+
github.com/zitadel/logging v0.7.0 // indirect
7375
github.com/zitadel/schema v1.3.2 // indirect
7476
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
75-
go.opentelemetry.io/otel v1.39.0 // indirect
76-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
77-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
77+
go.opentelemetry.io/otel v1.43.0 // indirect
78+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
79+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
7880
go.uber.org/atomic v1.11.0 // indirect
7981
go.yaml.in/yaml/v2 v2.4.3 // indirect
8082
go.yaml.in/yaml/v3 v3.0.4 // indirect
81-
golang.org/x/mod v0.32.0 // indirect
82-
golang.org/x/net v0.50.0 // indirect
83-
golang.org/x/sync v0.19.0 // indirect
84-
golang.org/x/sys v0.41.0 // indirect
85-
golang.org/x/text v0.34.0 // indirect
83+
golang.org/x/mod v0.34.0 // indirect
84+
golang.org/x/sync v0.20.0 // indirect
85+
golang.org/x/sys v0.42.0 // indirect
86+
golang.org/x/text v0.36.0 // indirect
8687
golang.org/x/time v0.14.0 // indirect
87-
golang.org/x/tools v0.41.0 // indirect
88+
golang.org/x/tools v0.43.0 // indirect
8889
google.golang.org/protobuf v1.36.11 // indirect
89-
gopkg.in/yaml.v2 v2.4.0 // indirect
9090
gopkg.in/yaml.v3 v3.0.1 // indirect
9191
)

0 commit comments

Comments
 (0)