Skip to content

Commit f0f13cf

Browse files
committed
Merge remote-tracking branch 'origin/master' into 8.0.x
2 parents 3922973 + 65e74a3 commit f0f13cf

17,717 files changed

Lines changed: 1071247 additions & 356463 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.

.circleci/config.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -192,20 +192,6 @@ jobs:
192192
- checkout
193193
- command_build_and_test:
194194
nodeNo: "3"
195-
node4:
196-
machine:
197-
image: ubuntu-2004:202201-02
198-
working_directory: ~/OpenAPITools/openapi-generator
199-
shell: /bin/bash --login
200-
environment:
201-
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
202-
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
203-
DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
204-
DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
205-
steps:
206-
- checkout
207-
- command_build_and_test:
208-
nodeNo: "4"
209195
workflows:
210196
version: 2
211197
build:
@@ -214,4 +200,3 @@ workflows:
214200
- node1
215201
- node2
216202
- node3
217-
- node4

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"ghcr.io/devcontainers/features/node:1": {
1010
"version": "lts"
1111
},
12+
"ghcr.io/devcontainers/features/rust:1": {},
1213
"ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
1314
"docker-in-docker": {
1415
"version": "latest",

.github/CODEOWNERS

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ modules/openapi-generator-cli/**/* @jimschubert
2828
modules/openapi-generator-gradle-plugin/**/* @jimschubert
2929
modules/openapi-generator-maven-plugin/**/* @jimschubert
3030

31-
# Martin Delille
31+
# cpp-qt-client technical committee
32+
modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @ravinikam
33+
samples/client/petstore/cpp-qt/**/* @ravinikam
34+
modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @stkrwork
35+
samples/client/petstore/cpp-qt/**/* @stkrwork
36+
modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @etherealjoy
37+
samples/client/petstore/cpp-qt/**/* @etherealjoy
3238
modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @martindelille
3339
samples/client/petstore/cpp-qt/**/* @martindelille
40+
modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @muttleyxd
41+
samples/client/petstore/cpp-qt/**/* @muttleyxd

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java-version: 11
2121
distribution: 'temurin'
2222
- name: Cache maven dependencies
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
env:
2525
cache-name: cache-maven-repository
2626
with:

.github/workflows/gradle-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
java-version: 11
3838
# Cache Gradle Dependencies
3939
- name: Setup Gradle Dependencies Cache
40-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4141
with:
4242
path: ~/.gradle/caches
4343
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
4444

4545
# Cache Gradle Wrapper
4646
- name: Setup Gradle Wrapper Cache
47-
uses: actions/cache@v3
47+
uses: actions/cache@v4
4848
with:
4949
path: ~/.gradle/wrapper
5050
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

.github/workflows/linux.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ jobs:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java }}
3030

31-
- uses: actions/cache@v3
31+
- uses: actions/cache@v4
3232
with:
3333
path: ~/.m2/repository
3434
key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
3535
restore-keys: |
3636
${{ runner.os }}-maven-
3737
38-
- uses: actions/cache@v3
38+
- uses: actions/cache@v4
3939
with:
4040
path: |
4141
~/.gradle/caches
@@ -45,7 +45,7 @@ jobs:
4545
${{ runner.os }}-gradle-
4646
4747
- name: Setup Maven
48-
uses: s4u/setup-maven-action@v1.11.0
48+
uses: s4u/setup-maven-action@v1.12.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.11.0
90+
uses: s4u/setup-maven-action@v1.12.0
9191
with:
9292
java-version: 11
9393
maven-version: 3.8.8

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java-version: 11
2121
distribution: 'temurin'
2222
- name: Cache maven dependencies
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
env:
2525
cache-name: cache-maven-repository
2626
with:

.github/workflows/openapi-generator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
java-version: 11
2323
distribution: 'temurin'
2424
- name: Cache maven dependencies
25-
uses: actions/cache@v3
25+
uses: actions/cache@v4
2626
env:
2727
cache-name: cache-maven-repository
2828
with:
@@ -60,7 +60,7 @@ jobs:
6060
java-version: 11
6161
distribution: 'temurin'
6262
- name: Cache maven dependencies
63-
uses: actions/cache@v3
63+
uses: actions/cache@v4
6464
env:
6565
cache-name: cache-maven-repository
6666
with:

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,31 @@ on:
44
push:
55
paths:
66
- 'samples/client/petstore/c/**'
7+
- 'samples/client/petstore/c-useJsonUnformatted/**'
78
pull_request:
89
paths:
910
- 'samples/client/petstore/c/**'
11+
- 'samples/client/petstore/c-useJsonUnformatted/**'
1012

1113
jobs:
1214
build:
1315
name: Build c libcurl client
1416
runs-on: ubuntu-latest
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
sample:
21+
- 'samples/client/petstore/c/'
22+
- 'samples/client/petstore/c-useJsonUnformatted/'
23+
1524
steps:
1625
- uses: actions/checkout@v4
1726
- name: Prepare
1827
run: |
1928
sudo apt-get update
2029
sudo apt-get install -y libssl-dev libcurl4-openssl-dev
2130
- name: Build
22-
working-directory: "samples/client/petstore/c"
31+
working-directory: ${{ matrix.sample }}
2332
run: |
2433
mkdir build
2534
cd build

.github/workflows/samples-dart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
java-version: 11
2525
cache: maven
2626
- name: Cache test dependencies
27-
uses: actions/cache@v3
27+
uses: actions/cache@v4
2828
env:
2929
cache-name: pub-cache
3030
with:

0 commit comments

Comments
 (0)