Skip to content

Commit 47c61f3

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 9263f4c + f357be4 commit 47c61f3

7,003 files changed

Lines changed: 209579 additions & 117962 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/samples-dotnet-standard.yaml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,16 @@ name: Samples C# .Net Standard Client
33
on:
44
push:
55
paths:
6-
# build C# API client (netstandard)
7-
- samples/client/petstore/csharp/OpenAPIClient/**
8-
- samples/client/petstore/csharp/*netstandard*/**
9-
# build C# API client (netstandard with ConditionalSerialization)
10-
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
11-
# build C# API client (netstandard httpclient)
12-
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
6+
- samples/client/petstore/csharp/generichost/standard2.0/**
7+
- samples/client/petstore/csharp/httpclient/standard2.0/**
8+
- samples/client/petstore/csharp/restsharp/standard2.0/**
9+
- samples/client/petstore/csharp/unityWebRequest/standard2.0/**
1310
pull_request:
1411
paths:
15-
# build C# API client (netstandard)
16-
- samples/client/petstore/csharp/OpenAPIClient/**
17-
- samples/client/petstore/csharp/*netstandard*/**
18-
# build C# API client (netstandard with ConditionalSerialization)
19-
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
20-
# build C# API client (netstandard httpclient)
21-
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
12+
- samples/client/petstore/csharp/generichost/standard2.0/**
13+
- samples/client/petstore/csharp/httpclient/standard2.0/**
14+
- samples/client/petstore/csharp/restsharp/standard2.0/**
15+
- samples/client/petstore/csharp/unityWebRequest/standard2.0/**
2216
jobs:
2317
build:
2418
name: Build .Net projects
@@ -27,13 +21,11 @@ jobs:
2721
fail-fast: false
2822
matrix:
2923
sample:
30-
# build C# API client (netstandard)
31-
- samples/client/petstore/csharp/OpenAPIClient/
32-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/
33-
# build C# API client (netstandard with ConditionalSerialization)
34-
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/
35-
# build C# API client (netstandard httpclient)
36-
- samples/client/petstore/csharp/OpenAPIClient-httpclient/
24+
- samples/client/petstore/csharp/generichost/standard2.0/Petstore/
25+
- samples/client/petstore/csharp/httpclient/standard2.0/Petstore/
26+
- samples/client/petstore/csharp/restsharp/standard2.0/Petstore/
27+
- samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/
28+
# - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
3729
steps:
3830
- uses: actions/checkout@v4
3931
- uses: actions/setup-dotnet@v4.0.0

.github/workflows/samples-dotnet.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ name: Samples C# .Net 8 Clients
33
on:
44
push:
55
paths:
6-
- samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**
7-
- samples/client/petstore/csharp/*net6.0*/**
8-
- samples/client/petstore/csharp/*net7.0*/**
9-
- samples/client/petstore/csharp/OpenAPIClient-*latest*/**
6+
- samples/client/petstore/csharp/generichost/net8/**
7+
- samples/client/petstore/csharp/httpclient/net8/**
8+
- samples/client/petstore/csharp/restsharp/net8/**
9+
- samples/client/petstore/csharp/unityWebRequest/net8/**
1010
pull_request:
1111
paths:
12-
- samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**
13-
- samples/client/petstore/csharp/*net6.0*/**
14-
- samples/client/petstore/csharp/*net7.0*/**
15-
- samples/client/petstore/csharp/OpenAPIClient-*latest*/**
12+
- samples/client/petstore/csharp/generichost/net8/**
13+
- samples/client/petstore/csharp/httpclient/net8/**
14+
- samples/client/petstore/csharp/restsharp/net8/**
15+
- samples/client/petstore/csharp/unityWebRequest/net8/**
1616
jobs:
1717
build:
1818
name: Build .Net projects
@@ -21,16 +21,16 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
sample:
24-
# clients
25-
- samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests
26-
- samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
27-
- samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
28-
- samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration
29-
- samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate
30-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
31-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
32-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
33-
- samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate
24+
- samples/client/petstore/csharp/generichost/net8/AllOf
25+
- samples/client/petstore/csharp/generichost/net8/AnyOf
26+
- samples/client/petstore/csharp/generichost/net8/FormModels
27+
- samples/client/petstore/csharp/generichost/net8/ManualPetstoreTests
28+
- samples/client/petstore/csharp/generichost/net8/ManualSourceGenerationTests
29+
- samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
30+
- samples/client/petstore/csharp/generichost/net8/OneOf
31+
- samples/client/petstore/csharp/generichost/net8/Petstore
32+
- samples/client/petstore/csharp/generichost/net8/SourceGeneration
33+
- samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
3434
steps:
3535
- uses: actions/checkout@v4
3636
- uses: actions/setup-dotnet@v4.0.0

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

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,10 @@ name: Samples C# .Net 6 Client
33
on:
44
push:
55
paths:
6-
# build C# API client (httpclient)
7-
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
8-
# build C# API client (.net framework 4.7)
9-
- samples/client/petstore/csharp/OpenAPIClient-net47/**
10-
# build C# API client (.net framework 4.8)
11-
- samples/client/petstore/csharp/OpenAPIClient-net48/**
12-
# build C# API client (property, parameter name mappings)
13-
- samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/**
14-
# build C# API client (multiple frameworks)
15-
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
6+
- samples/client/petstore/csharp/restsharp/net6/**
167
pull_request:
178
paths:
18-
# build C# API client (httpclient)
19-
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
20-
# build C# API client (.net framework 4.7)
21-
- samples/client/petstore/csharp/OpenAPIClient-net47/**
22-
# build C# API client (.net framework 4.8)
23-
- samples/client/petstore/csharp/OpenAPIClient-net48/**
24-
# build C# API client (property, parameter name mappings)
25-
- samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/**
26-
# build C# API client (multiple frameworks)
27-
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
9+
- samples/client/petstore/csharp/restsharp/net6/**
2810
jobs:
2911
build:
3012
name: Build .Net clients
@@ -33,16 +15,7 @@ jobs:
3315
fail-fast: false
3416
matrix:
3517
sample:
36-
# build C# API client (httpclient)
37-
- samples/client/petstore/csharp/OpenAPIClient-httpclient/
38-
# build C# API client (.net framework 4.7)
39-
- samples/client/petstore/csharp/OpenAPIClient-net47/
40-
# build C# API client (.net framework 4.8)
41-
- samples/client/petstore/csharp/OpenAPIClient-net48/
42-
# build C# API client (property, parameter name mappings)
43-
- samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/
44-
# build C# API client (multiple frameworks)
45-
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/
18+
- samples/client/petstore/csharp/restsharp/net6/ParameterMappings/
4619
steps:
4720
- uses: actions/checkout@v4
4821
- uses: actions/setup-dotnet@v4.0.0

.github/workflows/samples-java-client-jdk11.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
- samples/client/others/java/okhttp-gson-oneOf/**
1414
- samples/client/others/java/resttemplate-useAbstractionForFiles/**
1515
- samples/client/others/java/webclient-useAbstractionForFiles/**
16+
- samples/client/others/java/jersey2-oneOf-duplicates/**
17+
- samples/client/others/java/jersey2-oneOf-Mixed/**
1618
pull_request:
1719
paths:
1820
- 'samples/client/petstore/java/**'
@@ -25,6 +27,8 @@ on:
2527
- samples/client/others/java/okhttp-gson-oneOf/**
2628
- samples/client/others/java/resttemplate-useAbstractionForFiles/**
2729
- samples/client/others/java/webclient-useAbstractionForFiles/**
30+
- samples/client/others/java/jersey2-oneOf-duplicates/**
31+
- samples/client/others/java/jersey2-oneOf-Mixed/**
2832
jobs:
2933
build:
3034
name: Build Java Client JDK11
@@ -71,6 +75,8 @@ jobs:
7175
- samples/client/others/java/okhttp-gson-oneOf/
7276
- samples/client/others/java/resttemplate-useAbstractionForFiles/
7377
- samples/client/others/java/webclient-useAbstractionForFiles/
78+
- samples/client/others/java/jersey2-oneOf-duplicates/
79+
- samples/client/others/java/jersey2-oneOf-Mixed/
7480
steps:
7581
- uses: actions/checkout@v4
7682
- uses: actions/setup-java@v4

.github/workflows/samples-julia.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: julia-actions/setup-julia@v1
19+
- uses: julia-actions/setup-julia@v2
2020
with:
2121
version: 1.8
2222
arch: x64

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- samples/client/petstore/kotlin
2626
- samples/client/petstore/kotlin-gson
2727
- samples/client/petstore/kotlin-jackson
28+
- samples/client/petstore/kotlin-model-prefix-type-mappings
2829
# needs Android configured
2930
#- samples/client/petstore/kotlin-json-request-string
3031
- samples/client/petstore/kotlin-jvm-okhttp4-coroutines

.github/workflows/samples-kotlin-echo-api.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
sample:
2020
# clients
2121
- samples/client/echo_api/kotlin-jvm-spring-3-restclient
22+
- samples/client/echo_api/kotlin-model-prefix-type-mappings
2223
steps:
2324
- uses: actions/checkout@v4
2425
- uses: actions/setup-java@v4

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ on:
55
branches:
66
- samples/server/others/kotlin-server/jaxrs-spec/**
77
- 'samples/server/petstore/kotlin*/**'
8+
- 'samples/server/others/kotlin-server/jaxrs-spec-array-response/**'
89
# comment out due to gradle build failure
910
#- samples/server/petstore/kotlin-spring-default/**
1011
pull_request:
1112
paths:
1213
- samples/server/others/kotlin-server/jaxrs-spec/**
1314
- 'samples/server/petstore/kotlin*/**'
15+
- 'samples/server/others/kotlin-server/jaxrs-spec-array-response/**'
1416
# comment out due to gradle build failure
1517
# - samples/server/petstore/kotlin-spring-default/**
1618

@@ -40,6 +42,7 @@ jobs:
4042
- samples/server/petstore/kotlin-server-modelMutable
4143
- samples/server/petstore/kotlin-server/javalin
4244
- samples/server/others/kotlin-server/jaxrs-spec
45+
- samples/server/others/kotlin-server/jaxrs-spec-array-response
4346
# comment out due to gradle build failure
4447
#- samples/server/petstore/kotlin-spring-default
4548
# no build.gradle file

.github/workflows/samples-spring.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
- samples/openapi3/client/petstore/spring-cloud-async
3535
- samples/openapi3/client/petstore/spring-cloud-spring-pageable
3636
- samples/client/petstore/spring-cloud-tags
37+
- samples/client/petstore/spring-cloud-auth
3738
- samples/client/petstore/spring-cloud-deprecated
3839
# servers
3940
- samples/server/petstore/springboot

CI/circle_parallel.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ "$NODE_INDEX" = "1" ]; then
1313
echo "Running node $NODE_INDEX ..."
1414
java -version
1515

16-
sudo apt-get -y install cpanminus libmagic-dev
16+
sudo apt-get -y install cpanminus
1717

1818
(cd samples/client/petstore/perl && /bin/bash ./test.bash)
1919
(cd samples/client/petstore/ruby && mvn integration-test)
@@ -112,5 +112,3 @@ else
112112
(cd samples/client/petstore/java/apache-httpclient && mvn integration-test)
113113

114114
fi
115-
116-

0 commit comments

Comments
 (0)