Skip to content

Commit 101be6a

Browse files
authored
Merge branch 'master' into Fix_issue_22210
2 parents 351ee37 + 7ce0096 commit 101be6a

File tree

12,590 files changed

+328176
-61184
lines changed

Some content is hidden

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

12,590 files changed

+328176
-61184
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Please follow the issue template below for bug reports and feature requests.
3-
Also please indicate in the issue title which language/library is concerned. Eg: [JAVA] Bug generating foo with bar
3+
Also please indicate in the issue title which language/library is concerned. E.g.: [JAVA] Bug generating foo with bar
44
-->
55

66
##### Description

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ assignees: ''
1818

1919
<!--
2020
Please follow the issue template below for bug reports.
21-
Also please indicate in the issue title which language/library is concerned. Eg: [BUG][JAVA] Bug generating foo with bar
21+
Also please indicate in the issue title which language/library is concerned. E.g.: [BUG][JAVA] Bug generating foo with bar
2222
-->
2323

2424
##### Description

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
with:
2020
java-version: 11
2121
distribution: 'temurin'
22+
cache: gradle
2223
- name: Cache maven dependencies
2324
uses: actions/cache@v4
2425
env:

.github/workflows/gradle-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
with:
3838
distribution: 'temurin'
3939
java-version: 11
40+
cache: gradle
4041
# Cache Gradle Dependencies
4142
- name: Setup Gradle Dependencies Cache
4243
uses: actions/cache@v4

.github/workflows/linux.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java }}
30+
cache: gradle
3031

3132
- uses: actions/cache@v4
3233
with:
@@ -44,12 +45,12 @@ jobs:
4445
restore-keys: |
4546
${{ runner.os }}-gradle-
4647
47-
- uses: gradle/actions/setup-gradle@v4
48+
- uses: gradle/actions/setup-gradle@v5
4849
with:
4950
gradle-version: '8.14.3'
5051

5152
- name: Setup Maven
52-
uses: s4u/setup-maven-action@v1.18.0
53+
uses: s4u/setup-maven-action@v1.19.0
5354
with:
5455
java-version: ${{ matrix.java }}
5556
maven-version: 3.8.8
@@ -61,7 +62,7 @@ jobs:
6162
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6263

6364
- name: Upload Maven build artifact
64-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v5
6566
if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
6667
with:
6768
name: artifact
@@ -91,12 +92,13 @@ jobs:
9192
- name: Check out code
9293
uses: actions/checkout@v5
9394
- name: Setup Maven
94-
uses: s4u/setup-maven-action@v1.18.0
95+
uses: s4u/setup-maven-action@v1.19.0
9596
with:
9697
java-version: 11
9798
maven-version: 3.8.8
99+
cache: gradle
98100
- name: Download build artifact
99-
uses: actions/download-artifact@v5
101+
uses: actions/download-artifact@v6
100102
with:
101103
name: artifact
102104
- name: Run Ensures Script

.github/workflows/openapi-generator.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
with:
2222
java-version: 11
2323
distribution: 'temurin'
24+
cache: gradle
2425
- name: Cache maven dependencies
2526
uses: actions/cache@v4
2627
env:
@@ -41,7 +42,7 @@ jobs:
4142
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4243
- run: ls -la modules/openapi-generator-cli/target
4344
- name: Upload openapi-generator-cli.jar artifact
44-
uses: actions/upload-artifact@v4
45+
uses: actions/upload-artifact@v5
4546
with:
4647
name: openapi-generator-cli.jar
4748
path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -59,6 +60,7 @@ jobs:
5960
with:
6061
java-version: 11
6162
distribution: 'temurin'
63+
cache: gradle
6264
- name: Cache maven dependencies
6365
uses: actions/cache@v4
6466
env:
@@ -79,7 +81,7 @@ jobs:
7981
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
8082
- name: Publish unit test reports
8183
if: ${{ always() }}
82-
uses: actions/upload-artifact@v4
84+
uses: actions/upload-artifact@v5
8385
with:
8486
name: surefire-test-results
8587
path: '**/surefire-reports/TEST-*.xml'
@@ -97,7 +99,7 @@ jobs:
9799
java-version: 11
98100
distribution: 'temurin'
99101
- name: Download openapi-generator-cli.jar artifact
100-
uses: actions/download-artifact@v5
102+
uses: actions/download-artifact@v6
101103
with:
102104
name: openapi-generator-cli.jar
103105
path: modules/openapi-generator-cli/target
@@ -136,7 +138,7 @@ jobs:
136138
java-version: 11
137139
distribution: 'temurin'
138140
- name: Download openapi-generator-cli.jar artifact
139-
uses: actions/download-artifact@v5
141+
uses: actions/download-artifact@v6
140142
with:
141143
name: openapi-generator-cli.jar
142144
path: modules/openapi-generator-cli/target

.github/workflows/samples-aspnet-fastenpoints-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- samples/server/petstore/aspnet/fastendpoints-useValidators
2727
steps:
2828
- uses: actions/checkout@v5
29-
- uses: actions/setup-dotnet@v4.3.1
29+
- uses: actions/setup-dotnet@v5.0.0
3030
with:
3131
dotnet-version: '8.0.x'
3232
- name: Build
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Samples Clojure Client
2+
3+
on:
4+
push:
5+
paths:
6+
- samples/client/petstore/clojure/**
7+
pull_request:
8+
paths:
9+
- samples/client/petstore/clojure/**
10+
jobs:
11+
build:
12+
name: Build Clojure Client (JDK11)
13+
runs-on: ubuntu-latest
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
sample:
18+
- samples/client/petstore/clojure/
19+
services:
20+
petstore-api:
21+
image: swaggerapi/petstore
22+
ports:
23+
- 80:8080
24+
env:
25+
SWAGGER_HOST: http://petstore.swagger.io
26+
SWAGGER_BASE_PATH: /v2
27+
steps:
28+
- uses: actions/checkout@v5
29+
- name: Add hosts to /etc/hosts
30+
run: |
31+
sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
32+
- uses: actions/setup-java@v5
33+
with:
34+
distribution: 'temurin'
35+
java-version: 11
36+
- name: Cache maven dependencies
37+
uses: actions/cache@v4
38+
env:
39+
cache-name: maven-repository
40+
with:
41+
path: |
42+
~/.m2
43+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
44+
- name: Install Leiningen (if using Leiningen)
45+
run: |
46+
curl https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein > lein
47+
chmod +x lein
48+
sudo mv lein /usr/local/bin/
49+
- name: Run tests (Leiningen)
50+
working-directory: ${{ matrix.sample }}
51+
run: lein test
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Samples Dart (build, test)
2+
3+
on:
4+
push:
5+
branches:
6+
paths:
7+
#- samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/**
8+
#- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/**
9+
#- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/**
10+
- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/**
11+
- samples/openapi3/client/petstore/dart-dio/oneof/**
12+
- samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/**
13+
- samples/openapi3/client/petstore/dart-dio/binary_response/**
14+
- samples/openapi3/client/petstore/dart-dio/petstore-timemachine/**
15+
pull_request:
16+
paths:
17+
#- samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/**
18+
#- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/**
19+
#- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/**
20+
- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/**
21+
- samples/openapi3/client/petstore/dart-dio/oneof/**
22+
- samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/**
23+
- samples/openapi3/client/petstore/dart-dio/binary_response/**
24+
- samples/openapi3/client/petstore/dart-dio/petstore-timemachine/**
25+
26+
jobs:
27+
test:
28+
runs-on: ${{ matrix.os }}
29+
strategy:
30+
matrix:
31+
os: [ubuntu-latest, windows-latest]
32+
sdk: ["3.9.0"]
33+
sample:
34+
#- samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/
35+
#- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/
36+
#- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/
37+
- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/
38+
- samples/openapi3/client/petstore/dart-dio/oneof/
39+
- samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/
40+
- samples/openapi3/client/petstore/dart-dio/binary_response/
41+
- samples/openapi3/client/petstore/dart-dio/petstore-timemachine/
42+
steps:
43+
- uses: actions/checkout@v5
44+
45+
- uses: dart-lang/setup-dart@v1
46+
with:
47+
sdk: ${{ matrix.sdk }}
48+
49+
- name: pub get
50+
working-directory: ${{ matrix.sample }}
51+
run: dart pub get
52+
53+
- name: build_runner build
54+
working-directory: ${{ matrix.sample }}
55+
run: dart run build_runner build
56+
57+
- name: test
58+
working-directory: ${{ matrix.sample }}
59+
run: dart test
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Samples C# .Net Client (Petstore)
2+
3+
on:
4+
push:
5+
paths:
6+
- samples/client/petstore/csharp/restsharp/standard2.0/Petstore/**
7+
pull_request:
8+
paths:
9+
- samples/client/petstore/csharp/restsharp/standard2.0/Petstore/**
10+
jobs:
11+
build:
12+
name: Build clients
13+
runs-on: ubuntu-latest
14+
services:
15+
petstore-api:
16+
image: swaggerapi/petstore
17+
ports:
18+
- 80:8080
19+
env:
20+
SWAGGER_HOST: http://petstore.swagger.io
21+
SWAGGER_BASE_PATH: /v2
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
sample:
26+
- samples/client/petstore/csharp/restsharp/standard2.0/Petstore/
27+
steps:
28+
- uses: actions/checkout@v5
29+
- uses: actions/[email protected]
30+
with:
31+
dotnet-version: '7.0.x'
32+
- name: Build
33+
working-directory: ${{ matrix.sample }}
34+
run: dotnet build Org.OpenAPITools.sln
35+
- name: Test
36+
working-directory: ${{ matrix.sample }}
37+
run: dotnet test Org.OpenAPITools.sln

0 commit comments

Comments
 (0)