Skip to content

Commit 00b0ebf

Browse files
dsteeleydsteeley
committed
Merge remote-tracking branch 'upstream/master' into dsteeley/24097
2 parents 1d83ef0 + df45e93 commit 00b0ebf

592 files changed

Lines changed: 28489 additions & 1043 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/gradle-plugin-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4141
- name: Run tests with wrapper
4242
env:
43-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
43+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4444
run: |
4545
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper
4646
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
@@ -51,6 +51,6 @@ jobs:
5151
gradle-version: '8.14.3'
5252
- name: Run tests without wrapper
5353
env:
54-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
54+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5555
run: |
5656
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && gradle buildJavaResttemplateSdk) # not using gradle wrapper

‎.github/workflows/linux.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
shell: bash
6161
run: ./mvnw clean -nsu -B --quiet -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress install --file pom.xml
6262
env:
63-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
63+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6464

6565
- name: Upload Maven build artifact
6666
uses: actions/upload-artifact@v7
@@ -77,7 +77,7 @@ jobs:
7777
if: matrix.java == '11'
7878
shell: bash
7979
env:
80-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
80+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8181
run: |
8282
cd modules/openapi-generator-maven-plugin
8383
mvn clean verify -Pintegration

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
${{ runner.os }}-test-maven-plugin-
3636
- name: Run tests
3737
env:
38-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
38+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
${{ runner.os }}-test-maven-plugin-
3636
- name: Run tests
3737
env:
38-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
38+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
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

‎.github/workflows/mill-plugin-tests.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Maven Clean Install
3636
env:
37-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
37+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3838
run: |
3939
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
4040
@@ -51,19 +51,19 @@ jobs:
5151
5252
- name: Mill Example - Test Validation Command
5353
env:
54-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
54+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5555
run: |
5656
(cd modules/openapi-generator-mill-plugin/example/ && ./mill validateOpenapiSpec $(pwd)/api/petstore-invalid.yaml)
5757
5858
- name: Mill Example - Test Validation Task
5959
env:
60-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
60+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6161
run: |
6262
(cd modules/openapi-generator-mill-plugin/example/ && ./mill openapi.validate)
6363
6464
- name: Mill Example - Test Compile Task
6565
env:
66-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
66+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6767
run: |
6868
(cd modules/openapi-generator-mill-plugin/example/ && ./mill __.compile)
6969

‎.github/workflows/openapi-generator.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Run maven
4040
run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4141
env:
42-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
42+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4343
- run: ls -la modules/openapi-generator-cli/target
4444
- name: Upload openapi-generator-cli.jar artifact
4545
uses: actions/upload-artifact@v7
@@ -78,7 +78,7 @@ jobs:
7878
- name: Run unit tests
7979
run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error
8080
env:
81-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
81+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8282
- name: Publish unit test reports
8383
if: ${{ always() }}
8484
uses: actions/upload-artifact@v7

‎.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@v7
29-
- uses: actions/setup-dotnet@v5.3.0
29+
- uses: actions/setup-dotnet@v5.4.0
3030
with:
3131
dotnet-version: '8.0.x'
3232
- name: Build

‎.github/workflows/samples-dotnet-petstore-net10.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- samples/client/petstore/csharp/restsharp/net10/Petstore/
2727
steps:
2828
- uses: actions/checkout@v7
29-
- uses: actions/setup-dotnet@v5.3.0
29+
- uses: actions/setup-dotnet@v5.4.0
3030
with:
3131
dotnet-version: '10.0.x'
3232
- name: Build

‎.github/workflows/samples-dotnet-petstore.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- samples/client/petstore/csharp/restsharp/standard2.0/Petstore/
2727
steps:
2828
- uses: actions/checkout@v7
29-
- uses: actions/setup-dotnet@v5.3.0
29+
- uses: actions/setup-dotnet@v5.4.0
3030
with:
3131
dotnet-version: '7.0.x'
3232
- name: Build

‎.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@v7
31-
- uses: actions/setup-dotnet@v5.3.0
31+
- uses: actions/setup-dotnet@v5.4.0
3232
with:
3333
dotnet-version: 3.1.*
3434
- name: Build

0 commit comments

Comments
 (0)