Skip to content

Commit 6b47e69

Browse files
committed
Revert "Copy latest linux and windows github workflows from the parent repo"
This reverts commit e25d879.
1 parent 9fa5202 commit 6b47e69

2 files changed

Lines changed: 14 additions & 23 deletions

File tree

.github/workflows/linux.yaml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,22 @@ jobs:
2020
os: [ubuntu-latest]
2121
steps:
2222
- name: Check out code
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v4
2424

2525
- name: Set up JDK ${{ matrix.java }}
26-
uses: actions/setup-java@v5
26+
uses: actions/setup-java@v4
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java }}
30-
cache: gradle
3130

32-
- uses: actions/cache@v5
31+
- uses: actions/cache@v4
3332
with:
3433
path: ~/.m2/repository
3534
key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
3635
restore-keys: |
3736
${{ runner.os }}-maven-
3837
39-
- uses: actions/cache@v5
38+
- uses: actions/cache@v4
4039
with:
4140
path: |
4241
~/.gradle/caches
@@ -45,12 +44,8 @@ jobs:
4544
restore-keys: |
4645
${{ runner.os }}-gradle-
4746
48-
- uses: gradle/actions/setup-gradle@v5
49-
with:
50-
gradle-version: '8.14.3'
51-
5247
- name: Setup Maven
53-
uses: s4u/setup-maven-action@v1.19.0
48+
uses: s4u/setup-maven-action@v1.14.0
5449
with:
5550
java-version: ${{ matrix.java }}
5651
maven-version: 3.8.8
@@ -62,15 +57,15 @@ jobs:
6257
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6358

6459
- name: Upload Maven build artifact
65-
uses: actions/upload-artifact@v7
60+
uses: actions/upload-artifact@v4
6661
if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
6762
with:
6863
name: artifact
6964
path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
7065

7166
- name: Test Gradle plugin usage
7267
shell: bash
73-
run: gradle --project-dir modules/openapi-generator-gradle-plugin/samples/local-spec buildGoSdk --stacktrace
68+
run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace
7469

7570
- name: Test Maven plugin integration
7671
if: matrix.java == '11'
@@ -90,15 +85,14 @@ jobs:
9085
os: [ubuntu-latest]
9186
steps:
9287
- name: Check out code
93-
uses: actions/checkout@v5
88+
uses: actions/checkout@v4
9489
- name: Setup Maven
95-
uses: s4u/setup-maven-action@v1.19.0
90+
uses: s4u/setup-maven-action@v1.14.0
9691
with:
9792
java-version: 11
9893
maven-version: 3.8.8
99-
cache: gradle
10094
- name: Download build artifact
101-
uses: actions/download-artifact@v8
95+
uses: actions/download-artifact@v4
10296
with:
10397
name: artifact
10498
- name: Run Ensures Script

.github/workflows/windows.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ jobs:
1818
matrix:
1919
java: [11, 17]
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v4
2222
- name: Set up JDK ${{ matrix.java }}
23-
uses: actions/setup-java@v5
23+
uses: actions/setup-java@v4
2424
with:
2525
java-version: ${{ matrix.java }}
2626
distribution: 'temurin'
27-
cache: gradle
2827
- name: Cache maven dependencies
29-
uses: actions/cache@v5
28+
uses: actions/cache@v4
3029
env:
3130
cache-name: cache-maven-repository
3231
with:
@@ -40,7 +39,7 @@ jobs:
4039
${{ runner.os }}-build-${{ env.cache-name }}-
4140
${{ runner.os }}-build-
4241
- name: Setup Maven
43-
uses: s4u/setup-maven-action@v1.19.0
42+
uses: s4u/setup-maven-action@v1.14.0
4443
with:
4544
java-version: ${{ matrix.java }}
4645
maven-version: 3.8.8
@@ -55,8 +54,6 @@ jobs:
5554
java -jar ./openapi-generator-cli.jar author template --verbose -g jaxrs-spec --library quarkus
5655
- name: Setup Gradle
5756
uses: gradle/gradle-build-action@v3
58-
with:
59-
gradle-version: '8.14.3'
6057
- name: Gradle tests
6158
run: |
6259
gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace

0 commit comments

Comments
 (0)