Skip to content

Commit 2b23399

Browse files
committed
Merge remote-tracking branch 'origin/master' into 8.0.x
2 parents 99ca67d + 131fd51 commit 2b23399

File tree

9,586 files changed

+443018
-67062
lines changed

Some content is hidden

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

9,586 files changed

+443018
-67062
lines changed

.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/openapi-generator.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,24 @@ jobs:
151151
rm -rf samples/client/petstore/csharp/generichost/net8/Petstore
152152
rm -rf samples/client/petstore/csharp/generichost/net8/SourceGeneration
153153
rm -rf samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
154+
154155
rm -rf samples/client/petstore/csharp/generichost/standard2.0/Petstore
156+
157+
rm -rf samples/client/petstore/csharp/generichost/net4.8/AllOf
158+
rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOf
159+
rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare
160+
rm -rf samples/client/petstore/csharp/generichost/net4.8/FormModels
161+
rm -rf samples/client/petstore/csharp/generichost/net4.8/OneOf
162+
rm -rf samples/client/petstore/csharp/generichost/net4.8/Petstore
163+
rm -rf samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate
164+
165+
rm -rf samples/client/petstore/csharp/generichost/net4.7/AllOf
166+
rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOf
167+
rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
168+
rm -rf samples/client/petstore/csharp/generichost/net4.7/FormModels
169+
rm -rf samples/client/petstore/csharp/generichost/net4.7/OneOf
170+
rm -rf samples/client/petstore/csharp/generichost/net4.7/Petstore
171+
rm -rf samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
155172
- name: Generate samples
156173
run: |
157174
bash bin/generate-samples.sh

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

Lines changed: 4 additions & 7 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,6 @@ jobs:
1616
name: Build cpp qt client
1717
strategy:
1818
matrix:
19-
qt-version:
20-
- '5.15.2'
21-
- '6.5.3'
2219
os:
2320
- ubuntu-latest
2421
- macOS-latest
@@ -29,8 +26,8 @@ jobs:
2926
- name: Install Qt
3027
uses: jurplel/install-qt-action@v4
3128
with:
32-
version: ${{ matrix.qt-version }}
33-
tools: ${{ matrix.tools }}
29+
version: "6.7.1"
30+
target: "desktop"
3431
- name: Build
3532
working-directory: "samples/client/petstore/cpp-qt"
3633
run: cmake . && cmake --build .
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Samples C# .Net Framework Clients
2+
3+
on:
4+
push:
5+
paths:
6+
- samples/client/petstore/csharp/generichost/net4.7/**
7+
- samples/client/petstore/csharp/generichost/net4.8/**
8+
pull_request:
9+
paths:
10+
- samples/client/petstore/csharp/generichost/net4.7/**
11+
- samples/client/petstore/csharp/generichost/net4.8/**
12+
jobs:
13+
build:
14+
name: Build .Net projects
15+
runs-on: windows-2019
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
sample:
20+
- samples/client/petstore/csharp/generichost/net4.7/AllOf
21+
- samples/client/petstore/csharp/generichost/net4.7/AnyOf
22+
- samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
23+
- samples/client/petstore/csharp/generichost/net4.7/FormModels
24+
- samples/client/petstore/csharp/generichost/net4.7/OneOf
25+
- samples/client/petstore/csharp/generichost/net4.7/Petstore
26+
- samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
27+
28+
- samples/client/petstore/csharp/generichost/net4.8/AllOf
29+
- samples/client/petstore/csharp/generichost/net4.8/AnyOf
30+
- samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare
31+
- samples/client/petstore/csharp/generichost/net4.8/FormModels
32+
- samples/client/petstore/csharp/generichost/net4.8/OneOf
33+
- samples/client/petstore/csharp/generichost/net4.8/Petstore
34+
- samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate
35+
steps:
36+
- uses: actions/checkout@v4
37+
- name: Build
38+
working-directory: ${{ matrix.sample }}
39+
run: dotnet build Org.OpenAPITools.sln
40+
- name: Test
41+
working-directory: ${{ matrix.sample }}
42+
run: dotnet test Org.OpenAPITools.sln

.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/[email protected].0
31+
- uses: actions/[email protected].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/[email protected].0
37+
- uses: actions/[email protected].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/[email protected].0
22+
- uses: actions/[email protected].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/[email protected].0
21+
- uses: actions/[email protected].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/[email protected].0
28+
- uses: actions/[email protected].1
2929
with:
3030
dotnet-version: '6.0.x'
3131
- name: Build

0 commit comments

Comments
 (0)