Skip to content

Commit d7cccdd

Browse files
wing328wing328
committed
Merge remote-tracking branch 'origin/master' into typescript-playwright
2 parents 07ae0fa + f098b10 commit d7cccdd

53,369 files changed

Lines changed: 4015102 additions & 808625 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: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,26 @@ commands: # a reusable command with parameters
2424
libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \
2525
libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates \
2626
fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget libgbm1
27-
# The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
28-
- checkout
27+
# Avoid intermittent SSH checkout failures from CircleCI workers.
28+
- run:
29+
name: Checkout source over HTTPS with retry
30+
command: |
31+
if [ -n "${CIRCLE_PULL_REQUEST:-}" ]; then
32+
ref="refs/pull/${CIRCLE_PULL_REQUEST##*/}/head"
33+
elif [[ "${CIRCLE_BRANCH:-}" =~ ^pull/[0-9]+$ ]]; then
34+
ref="refs/${CIRCLE_BRANCH}/head"
35+
else
36+
ref="$CIRCLE_SHA1"
37+
fi
38+
git init .
39+
git remote add origin https://github.com/OpenAPITools/openapi-generator.git
40+
for i in $(seq 1 5); do
41+
if git fetch --depth=1 origin "$ref" && git checkout --detach FETCH_HEAD; then
42+
exit 0
43+
fi
44+
sleep 5
45+
done
46+
exit 1
2947
# Prepare for artifact and test results collection equivalent to how it was done on 1.0.
3048
# In many cases you can simplify this from what is generated here.
3149
# 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
@@ -189,7 +207,6 @@ jobs:
189207
DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
190208
DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
191209
steps:
192-
- checkout
193210
- command_build_and_test:
194211
nodeNo: "3"
195212
workflows:

‎.ddev/web-build/Dockerfile.maven‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
RUN apt update && apt install -y maven

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
},
1212
"ghcr.io/devcontainers/features/rust:1": {},
1313
"ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
14-
"docker-in-docker": {
14+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
1515
"version": "latest",
16-
"moby": true,
17-
"dockerDashComposeVersion": "v1"
16+
"moby": false
1817
}
1918
},
2019
// Configure tool-specific properties.

‎.geminiignore‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# .geminiignore
2+
# This file specifies intentionally untracked files that Gemini CLI should ignore.
3+
# It uses the same pattern matching rules as .gitignore.
4+
5+
# Build artifacts
6+
target/
7+
build/
8+
*.jar
9+
*.war
10+
*.ear
11+
*.class
12+
*.log
13+
14+
# IDE and editor files
15+
.idea/
16+
.vscode/
17+
*.iml
18+
*.ipr
19+
*.iws
20+
21+
# Maven/Gradle wrapper directories
22+
.mvn/wrapper/
23+
.gradle/
24+
25+
# Node.js dependencies for website
26+
website/node_modules/
27+
website/build/
28+
29+
# Generated sources by OpenAPI Generator (usually not to be touched directly)
30+
# This includes sample outputs which are generated code for various languages.
31+
samples/
32+
33+
# Temporary files
34+
tmp/
35+
.DS_Store
36+
# Eclipse
37+
.classpath
38+
.project
39+
.settings
40+
41+
# IntelliJ IDEA
42+
.idea/
43+
*.iml
44+
*.iws
45+
*.iwp
46+
.vscode/
47+
48+
# MacOS
49+
.DS_Store
50+
51+
# ReSharper
52+
*.resharper
53+
54+
# Visual Studio
55+
.vs/
56+
*.user
57+
*.suo
58+
*.sln.docstates
59+
60+
# Other
61+
*.bak
62+
*.swp
63+
*~
64+
.#*

‎.github/CODEOWNERS‎

Lines changed: 4 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
@@ -39,3 +28,7 @@ modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @martindelille
3928
samples/client/petstore/cpp-qt/**/* @martindelille
4029
modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @muttleyxd
4130
samples/client/petstore/cpp-qt/**/* @muttleyxd
31+
32+
# cpp-rest-client technical committee
33+
modules/openapi-generator/src/main/resources/cpp-rest-client/**/* @aminya
34+
samples/client/petstore/cpp-restsdk/**/* @aminya

‎.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ assignees: ''
1010
#### Bug Report Checklist
1111

1212
- [ ] Have you provided a full/minimal spec to reproduce the issue?
13-
- [ ] Have you validated the input using an OpenAPI validator ([example](https://apidevtools.org/swagger-parser/online/))?
13+
- [ ] Have you validated the input using an OpenAPI validator?
1414
- [ ] Have you [tested with the latest master](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) to confirm the issue still exists?
1515
- [ ] Have you searched for related issues/PRs?
1616
- [ ] What's the actual output vs expected output?
17-
- [ ] [Optional] Sponsorship to speed up the bug fix or feature request ([example](https://github.com/OpenAPITools/openapi-generator/issues/6178))
17+
- [ ] [Optional] Sponsorship to speed up the bug fix or feature request ([example](https://redirect.github.com/OpenAPITools/openapi-generator/issues/6178))
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/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
### PR checklist
55

66
- [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
7-
- [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
87
- [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples:
98
```
10-
./mvnw clean package
11-
./bin/generate-samples.sh ./bin/configs/*.yaml
12-
./bin/utils/export_docs_generators.sh
9+
./mvnw clean package || exit
10+
./bin/generate-samples.sh ./bin/configs/*.yaml || exit
11+
./bin/utils/export_docs_generators.sh || exit
1312
```
14-
(For Windows users, please run the script in [Git BASH](https://gitforwindows.org/))
13+
(For Windows users, please run the script in [WSL](https://learn.microsoft.com/en-us/windows/wsl/install))
1514
Commit all changed files.
1615
This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master.
1716
These must match the expectations made by your contribution.
1817
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`.
1918
IMPORTANT: Do **NOT** purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
20-
- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.6.0 minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
2119
- [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.

‎.github/workflows/docker-release.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Release to DockerHub (snapshot, stable)
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*' # Triggers on any tag starting with 'v' (e.g., v1.0, v2.1.3)
7+
branches:
8+
- master
9+
jobs:
10+
docker:
11+
name: Publish images
12+
runs-on: ubuntu-latest
13+
steps:
14+
# build the JARs
15+
- uses: actions/checkout@v7
16+
with:
17+
fetch-depth: 0
18+
- name: Set up JDK 11
19+
uses: actions/setup-java@v6
20+
with:
21+
java-version: 11
22+
distribution: 'zulu'
23+
- name: Cache Maven packages
24+
uses: actions/cache@v6
25+
with:
26+
path: ~/.m2
27+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
28+
restore-keys: ${{ runner.os }}-m2
29+
- name: Build
30+
run: ./mvnw clean install -DskipTests=true
31+
32+
# docker workflow
33+
- name: Set up QEMU
34+
uses: docker/setup-qemu-action@v4
35+
- name: Set up Docker Buildx
36+
uses: docker/setup-buildx-action@v4
37+
- name: Login to DockerHub
38+
uses: docker/login-action@v4.6.0
39+
with:
40+
username: ${{ secrets.DOCKER_USERNAME }}
41+
password: ${{ secrets.DOCKER_PASSWORD }}
42+
- name: Setup variables
43+
run: |
44+
# set as GitHub ENV variables
45+
echo "cli_version=$(\./mvnw -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[')" >> $GITHUB_ENV
46+
echo "build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> $GITHUB_ENV
47+
echo "DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online" >> $GITHUB_ENV
48+
echo "DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli" >> $GITHUB_ENV
49+
50+
# online images
51+
- name: Publish openapi-generator-online snapshot version
52+
if: github.ref_type != 'tag' # not tag (release)
53+
run: |
54+
docker buildx create --use
55+
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=${{ env.build_date }} --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$GITHUB_SHA --label=org.opencontainers.image.version=${{ env.cli_version }} -t ${{ env.DOCKER_GENERATOR_IMAGE_NAME }} ./modules/openapi-generator-online
56+
- name: Publish openapi-generator-online stable version
57+
if: github.ref_type == 'tag' # tagged (release)
58+
run: |
59+
docker buildx create --use
60+
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=${{ env.build_date }} --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$GITHUB_SHA --label=org.opencontainers.image.version=${{ env.cli_version }} -t ${{ env.DOCKER_GENERATOR_IMAGE_NAME }}:latest -t ${{ env.DOCKER_GENERATOR_IMAGE_NAME }}:${{ github.ref_name }} -t ${{ env.DOCKER_GENERATOR_IMAGE_NAME }} -t ${{ env.DOCKER_GENERATOR_IMAGE_NAME }}:latest-release ./modules/openapi-generator-online
61+
62+
# cli images
63+
- name: Publish openapi-generator-cli snapshot version
64+
if: github.ref_type != 'tag' # not tag (release)
65+
run: |
66+
cp docker-entrypoint.sh ./modules/openapi-generator-cli
67+
docker buildx create --use
68+
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=${{ env.build_date }} --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$GITHUB_SHA --label=org.opencontainers.image.version=${{ env.cli_version }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }} ./modules/openapi-generator-cli
69+
- name: Publish openapi-generator-cli stable version
70+
if: github.ref_type == 'tag' # tagged (release)
71+
run: |
72+
cp docker-entrypoint.sh ./modules/openapi-generator-cli
73+
docker buildx create --use
74+
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=${{ env.build_date }} --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$GITHUB_SHA --label=org.opencontainers.image.version=${{ env.cli_version }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:latest -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:${{ github.ref_name }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:latest-release ./modules/openapi-generator-cli

‎.github/workflows/docker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Check out code
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v7
3030

3131
- name: Test run-in-docker.sh
3232
shell: bash

0 commit comments

Comments
 (0)