Skip to content

Commit f68d6a8

Browse files
authored
Merge branch 'main' into feature/parameters_for_accept_header
2 parents 669f2df + 5281f36 commit f68d6a8

554 files changed

Lines changed: 66133 additions & 19437 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
flags: "-race"
2828
steps:
2929
- name: Checkout code
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131

3232
- name: Install Go
33-
uses: actions/setup-go@v5
33+
uses: actions/setup-go@v6
3434
with:
3535
go-version: "oldstable"
3636
cache: false
@@ -81,10 +81,10 @@ jobs:
8181

8282
steps:
8383
- name: Checkout code
84-
uses: actions/checkout@v4
84+
uses: actions/checkout@v5
8585

8686
- name: Install Go
87-
uses: actions/setup-go@v5
87+
uses: actions/setup-go@v6
8888
with:
8989
go-version: "oldstable"
9090
cache: false
@@ -112,7 +112,7 @@ jobs:
112112
runs-on: ubuntu-latest
113113
steps:
114114
- name: Checkout code
115-
uses: actions/checkout@v4
115+
uses: actions/checkout@v5
116116

117117
- name: Build image
118118
run: |
@@ -125,3 +125,10 @@ jobs:
125125
-v ./_testdata/examples/petstore.yml:/petstore.yml \
126126
--rm \
127127
ghcr.io/$GITHUB_REPOSITORY:$GITHUB_SHA /petstore.yml
128+
129+
- name: Check image certs
130+
run: |
131+
docker run \
132+
--rm \
133+
ghcr.io/$GITHUB_REPOSITORY:$GITHUB_SHA \
134+
https://raw.githubusercontent.com/ogen-go/ogen/refs/heads/main/_testdata/examples/petstore.yml

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
@@ -51,7 +51,7 @@ jobs:
5151
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5252

5353
- name: Install Go
54-
uses: actions/setup-go@v5
54+
uses: actions/setup-go@v6
5555
with:
5656
go-version: "oldstable"
5757
cache: false

.github/workflows/commitlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
if: github.event.pull_request.user.login != 'dependabot[bot]'
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v5
1010
with:
1111
fetch-depth: 0
1212
- uses: wagoid/commitlint-github-action@v6.2.1

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Install Go
13-
uses: actions/setup-go@v5
13+
uses: actions/setup-go@v6
1414
with:
1515
go-version: "oldstable"
1616
cache: false
@@ -32,7 +32,7 @@ jobs:
3232
coverage-${{ runner.os }}-${{ runner.arch }}-go-
3333
3434
- name: Checkout code
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636

3737
- name: Run tests with coverage
3838
run: make coverage

.github/workflows/image_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Set up QEMU
2020
uses: docker/setup-qemu-action@v3

.github/workflows/lint.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
- name: Install Go
17-
uses: actions/setup-go@v5
17+
uses: actions/setup-go@v6
1818
with:
1919
go-version: "oldstable"
2020
cache: false
@@ -55,10 +55,10 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- name: Checkout code
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@v5
5959

6060
- name: Install Go
61-
uses: actions/setup-go@v5
61+
uses: actions/setup-go@v6
6262
with:
6363
go-version: "oldstable"
6464
cache: false
@@ -105,10 +105,10 @@ jobs:
105105
runs-on: ubuntu-latest
106106
steps:
107107
- name: Checkout code
108-
uses: actions/checkout@v4
108+
uses: actions/checkout@v5
109109

110110
- name: Install Go
111-
uses: actions/setup-go@v5
111+
uses: actions/setup-go@v6
112112
with:
113113
go-version: "oldstable"
114114
cache: false

.github/workflows/tidy-autocommit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
private_key: ${{ secrets.APP_PRIVATE_KEY }}
3333

3434
- name: Checkout code
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636
with:
3737
repository: ${{ inputs.repository }}
3838
ref: ${{ inputs.ref }}
3939
token: ${{ steps.generate-token.outputs.token }}
4040

4141
- name: Install Go
42-
uses: actions/setup-go@v5
42+
uses: actions/setup-go@v6
4343
with:
4444
go-version: "oldstable"
4545
cache: false

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ _bin/*
66

77
*.out
88
*.dump
9+
cmd/ogen/ogen
10+
cmd/jschemagen/jschemagen

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
ARG GO_VERSION=latest
2+
ARG BASE_IMAGE=gcr.io/distroless/base-debian12
23

3-
FROM golang:$GO_VERSION AS builder
4+
FROM golang:${GO_VERSION} AS builder
45
WORKDIR /go/src/app
56
COPY . .
67
RUN go mod download
78
RUN CGO_ENABLED=0 go build -o /go/bin/ogen ./cmd/ogen/main.go
89
RUN CGO_ENABLED=0 go build -o /go/bin/jschemagen ./cmd/jschemagen/main.go
910

10-
FROM scratch
11+
FROM ${BASE_IMAGE}
1112
# We need go in resulting image to run goimports.
1213
COPY --from=builder /usr/local/go/ /usr/local/go/
1314
ENV PATH="/usr/local/go/bin:${PATH}"
1415
# Copy built binary.
1516
WORKDIR /
16-
COPY --from=builder /go/bin/ogen ./ogen
17-
COPY --from=builder /go/bin/jschemagen ./jschemagen
18-
ENTRYPOINT ["./ogen"]
17+
COPY --from=builder /go/bin/ogen /ogen
18+
COPY --from=builder /go/bin/jschemagen /jschemagen
19+
ENTRYPOINT ["/ogen"]

_testdata/examples/api.github.com.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96299,4 +96299,4 @@
9629996299
}
9630096300
}
9630196301
}
96302-
}
96302+
}

0 commit comments

Comments
 (0)