Skip to content

Commit 91d1c92

Browse files
committed
Merge branch 'master' of github.com:OpenAPITools/openapi-generator into feat/dart-next
2 parents df54cd4 + 78ea8af commit 91d1c92

File tree

20,464 files changed

+885148
-228220
lines changed

Some content is hidden

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

20,464 files changed

+885148
-228220
lines changed

.ddev/web-build/Dockerfile.maven

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
RUN apt update && apt install -y maven

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
- [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
88
- [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples:
99
```
10-
./mvnw clean package
11-
./bin/generate-samples.sh ./bin/configs/*.yaml
12-
./bin/utils/export_docs_generators.sh
10+
./mvnw clean package || exit
11+
./bin/generate-samples.sh ./bin/configs/*.yaml || exit
12+
./bin/utils/export_docs_generators.sh || exit
1313
```
1414
(For Windows users, please run the script in [Git BASH](https://gitforwindows.org/))
1515
Commit all changed files.
1616
This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master.
1717
These must match the expectations made by your contribution.
1818
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`.
1919
IMPORTANT: Do **NOT** purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
20-
- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.6.0 minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
20+
- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming `7.x.0` minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
2121
- [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.

.github/workflows/gradle-test.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
- samples/client/petstore/java/okhttp-gson
3030
- samples/client/petstore/java/okhttp-gson-group-parameter
3131
- samples/client/petstore/java/webclient-swagger2
32+
- samples/client/petstore/java/native
33+
- samples/client/petstore/java/native-jakarta
3234
steps:
3335
- uses: actions/checkout@v4
3436
- uses: actions/setup-java@v4

.github/workflows/linux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
${{ runner.os }}-gradle-
4646
4747
- name: Setup Maven
48-
uses: s4u/setup-maven-action@v1.14.0
48+
uses: s4u/setup-maven-action@v1.18.0
4949
with:
5050
java-version: ${{ matrix.java }}
5151
maven-version: 3.8.8
@@ -87,7 +87,7 @@ jobs:
8787
- name: Check out code
8888
uses: actions/checkout@v4
8989
- name: Setup Maven
90-
uses: s4u/setup-maven-action@v1.14.0
90+
uses: s4u/setup-maven-action@v1.18.0
9191
with:
9292
java-version: 11
9393
maven-version: 3.8.8

.github/workflows/openapi-generator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ jobs:
142142
path: modules/openapi-generator-cli/target
143143
- name: Delete samples that are entirely generated
144144
run: |
145+
rm -rf samples/client/petstore/csharp/generichost/latest/Tags
146+
145147
rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
146148
rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf
147149
rm -rf samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Samples C# .Net 8 FastEndpoints Server
2+
3+
on:
4+
push:
5+
paths:
6+
- samples/server/petstore/aspnet/fastendpoints/**
7+
- samples/server/petstore/aspnet/fastendpoints-*/**
8+
pull_request:
9+
paths:
10+
- samples/server/petstore/aspnet/fastendpoints/**
11+
- samples/server/petstore/aspnet/fastendpoints-*/**
12+
jobs:
13+
build:
14+
name: Build .Net 8 FastEndpoints servers
15+
runs-on: ubuntu-latest
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
sample:
20+
- samples/server/petstore/aspnet/fastendpoints
21+
- samples/server/petstore/aspnet/fastendpoints-useApiVersioning
22+
- samples/server/petstore/aspnet/fastendpoints-useAuthentication
23+
- samples/server/petstore/aspnet/fastendpoints-useProblemDetails
24+
- samples/server/petstore/aspnet/fastendpoints-useRecords
25+
- samples/server/petstore/aspnet/fastendpoints-useResponseCaching
26+
- samples/server/petstore/aspnet/fastendpoints-useValidators
27+
steps:
28+
- uses: actions/checkout@v4
29+
- uses: actions/[email protected]
30+
with:
31+
dotnet-version: '8.0.x'
32+
- name: Build
33+
working-directory: ${{ matrix.sample }}
34+
run: dotnet build Org.OpenAPITools.sln

.github/workflows/samples-c-libcurl-client.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
paths:
66
- 'samples/client/petstore/c/**'
77
- 'samples/client/petstore/c-useJsonUnformatted/**'
8+
- 'samples/client/others/c/bearerAuth/**'
89
pull_request:
910
paths:
1011
- 'samples/client/petstore/c/**'
1112
- 'samples/client/petstore/c-useJsonUnformatted/**'
13+
- 'samples/client/others/c/bearerAuth/**'
1214

1315
jobs:
1416
build:
@@ -20,6 +22,7 @@ jobs:
2022
sample:
2123
- 'samples/client/petstore/c/'
2224
- 'samples/client/petstore/c-useJsonUnformatted/'
25+
- 'samples/client/others/c/bearerAuth/'
2326

2427
steps:
2528
- uses: actions/checkout@v4

.github/workflows/samples-dotnet-standard.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
build:
1818
name: Build .Net projects
19-
runs-on: ubuntu-latest
19+
runs-on: windows-latest
2020
strategy:
2121
fail-fast: false
2222
matrix:
@@ -28,7 +28,7 @@ jobs:
2828
# - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
2929
steps:
3030
- uses: actions/checkout@v4
31-
- uses: actions/setup-dotnet@v4.0.1
31+
- uses: actions/setup-dotnet@v4.2.0
3232
with:
3333
dotnet-version: 3.1.*
3434
- name: Build

.github/workflows/samples-dotnet.yaml

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

.github/workflows/samples-dotnet6-client-echo-api.yaml

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

0 commit comments

Comments
 (0)