Skip to content

Commit 0d3e23f

Browse files
authored
Merge branch 'OpenAPITools:master' into master
2 parents e2f8436 + 7dcaece commit 0d3e23f

12,252 files changed

Lines changed: 283513 additions & 91535 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/CODEOWNERS

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,11 @@ modules/openapi-generator-core/**/* @OpenAPITools/generator-core-team
1212
# No need for auto-generated subdirectories (reduces noise)
1313
docs/ @OpenAPITools/generator-core-team
1414

15-
## Individual interests
16-
.github/**/* @jimschubert
17-
scripts/**/* @jimschubert
18-
website/**/* @jimschubert
19-
bin/ci/**/* @jimschubert
20-
2115
## Build related
2216
CI/**/* @OpenAPITools/build
2317
.mvn/**/* @OpenAPITools/build
2418
bin/utils/**/* @OpenAPITools/build
2519

26-
## Module-specific
27-
modules/openapi-generator-cli/**/* @jimschubert
28-
modules/openapi-generator-gradle-plugin/**/* @jimschubert
29-
modules/openapi-generator-maven-plugin/**/* @jimschubert
30-
3120
# cpp-qt-client technical committee
3221
modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @ravinikam
3322
samples/client/petstore/cpp-qt/**/* @ravinikam

.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.13.0
48+
uses: s4u/setup-maven-action@v1.14.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.13.0
90+
uses: s4u/setup-maven-action@v1.14.0
9191
with:
9292
java-version: 11
9393
maven-version: 3.8.8

.github/workflows/maven-plugin-tests.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
run: |
4040
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
4141
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
42+
./mvnw --no-snapshot-updates --quiet clean install -f modules/openapi-generator-maven-plugin/examples/multi-module/sample-external-ref-schema/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4243
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4344
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4445
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

.github/workflows/samples-cpp-qt-client.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Samples cpp qt client
33
on:
44
push:
55
branches:
6-
- 'samples/client/petstore/cpp-qt/**'
6+
- "samples/client/petstore/cpp-qt*/**"
77
pull_request:
88
paths:
9-
- 'samples/client/petstore/cpp-qt/**'
9+
- "samples/client/petstore/cpp-qt*/**"
1010

1111
env:
1212
GRADLE_VERSION: 6.9
@@ -16,9 +16,9 @@ jobs:
1616
name: Build cpp qt client
1717
strategy:
1818
matrix:
19-
qt-version:
20-
- '5.15.2'
21-
- '6.5.3'
19+
sample:
20+
- samples/client/petstore/cpp-qt
21+
- samples/client/petstore/cpp-qt-addDownloadProgress
2222
os:
2323
- ubuntu-latest
2424
- macOS-latest
@@ -29,8 +29,8 @@ jobs:
2929
- name: Install Qt
3030
uses: jurplel/install-qt-action@v4
3131
with:
32-
version: ${{ matrix.qt-version }}
33-
tools: ${{ matrix.tools }}
32+
version: "6.7.1"
33+
target: "desktop"
3434
- name: Build
35-
working-directory: "samples/client/petstore/cpp-qt"
36-
run: cmake . && cmake --build .
35+
working-directory: ${{ matrix.sample }}
36+
run: cmake . && cmake --build . --verbose

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.0
31+
- uses: actions/setup-dotnet@v4.0.1
3232
with:
3333
dotnet-version: 3.1.*
3434
- name: Build

.github/workflows/samples-dotnet.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
3535
steps:
3636
- uses: actions/checkout@v4
37-
- uses: actions/setup-dotnet@v4.0.0
37+
- uses: actions/setup-dotnet@v4.0.1
3838
with:
3939
dotnet-version: '8.0.x'
4040
- name: Build

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- samples/client/echo_api/csharp-restsharp/
2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: actions/setup-dotnet@v4.0.0
22+
- uses: actions/setup-dotnet@v4.0.1
2323
with:
2424
dotnet-version: '6.0.x'
2525
- name: Run echo server

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- samples/client/petstore/csharp/restsharp/net6/ParameterMappings/
1919
steps:
2020
- uses: actions/checkout@v4
21-
- uses: actions/setup-dotnet@v4.0.0
21+
- uses: actions/setup-dotnet@v4.0.1
2222
with:
2323
dotnet-version: '6.0.x'
2424
- name: Build

.github/workflows/samples-dotnet6-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- samples/server/petstore/aspnetcore-6.0-useSwashBuckle
2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: actions/setup-dotnet@v4.0.0
28+
- uses: actions/setup-dotnet@v4.0.1
2929
with:
3030
dotnet-version: '6.0.x'
3131
- name: Build
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Samples C# .Net 8 Server
2+
3+
on:
4+
push:
5+
paths:
6+
- samples/server/petstore/aspnetcore-8.0/**
7+
- samples/server/petstore/aspnetcore-8.0-*/**
8+
pull_request:
9+
paths:
10+
- samples/server/petstore/aspnetcore-8.0/**
11+
- samples/server/petstore/aspnetcore-8.0-*/**
12+
jobs:
13+
build:
14+
name: Build .Net 8 servers
15+
runs-on: ubuntu-latest
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
sample:
20+
- samples/server/petstore/aspnetcore-8.0
21+
- samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse
22+
- samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes
23+
- samples/server/petstore/aspnetcore-8.0-pocoModels
24+
- samples/server/petstore/aspnetcore-8.0-project4Models
25+
- samples/server/petstore/aspnetcore-8.0-useSwashBuckle
26+
steps:
27+
- uses: actions/checkout@v4
28+
- uses: actions/setup-dotnet@v4.0.1
29+
with:
30+
dotnet-version: '8.0.x'
31+
- name: Build
32+
working-directory: ${{ matrix.sample }}
33+
run: dotnet build Org.OpenAPITools.sln
34+
- name: Test
35+
working-directory: ${{ matrix.sample }}
36+
run: dotnet test Org.OpenAPITools.sln

0 commit comments

Comments
 (0)