From 0b7d7f165cd26465f600d0ee834626760d871237 Mon Sep 17 00:00:00 2001 From: "Sai Ram Varma Gadiraju -X (sagadira - XORIANT SOLUTIONS PRIVATE LIMITED at Cisco)" Date: Thu, 18 Jun 2026 11:13:45 +0530 Subject: [PATCH 1/2] ci: Fix Node.js 20 deprecation - update actions to v5 --- .github/workflows/linux.yaml | 18 +++++++++--------- .github/workflows/windows.yaml | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 27a2fbe420a1..b53a0d2c2ae0 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -20,22 +20,22 @@ jobs: os: [ubuntu-latest] steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} - - uses: actions/cache@v4 + - uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - uses: actions/cache@v4 + - uses: actions/cache@v5 with: path: | ~/.gradle/caches @@ -45,7 +45,7 @@ jobs: ${{ runner.os }}-gradle- - name: Setup Maven - uses: s4u/setup-maven-action@v1.18.0 + uses: s4u/setup-maven-action@v1.20.0 with: java-version: ${{ matrix.java }} maven-version: 3.8.8 @@ -57,7 +57,7 @@ jobs: GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - name: Upload Maven build artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 if: matrix.java == '11' && matrix.os == 'ubuntu-latest' with: name: artifact @@ -85,14 +85,14 @@ jobs: os: [ubuntu-latest] steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Maven - uses: s4u/setup-maven-action@v1.18.0 + uses: s4u/setup-maven-action@v1.20.0 with: java-version: 11 maven-version: 3.8.8 - name: Download build artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: artifact - name: Run Ensures Script diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 5824c4cd90f8..59fac4c2f469 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -18,14 +18,14 @@ jobs: matrix: java: [11, 17] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} distribution: 'temurin' - name: Cache maven dependencies - uses: actions/cache@v4 + uses: actions/cache@v5 env: cache-name: cache-maven-repository with: @@ -39,7 +39,7 @@ jobs: ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- - name: Setup Maven - uses: s4u/setup-maven-action@v1.18.0 + uses: s4u/setup-maven-action@v1.20.0 with: java-version: ${{ matrix.java }} maven-version: 3.8.8 From ddee17213898ad26127917351a8fef47cbeade43 Mon Sep 17 00:00:00 2001 From: "Sai Ram Varma Gadiraju -X (sagadira - XORIANT SOLUTIONS PRIVATE LIMITED at Cisco)" Date: Thu, 18 Jun 2026 12:03:38 +0530 Subject: [PATCH 2/2] ci: Fix Gradle setup in Linux/Windows workflows - Add gradle/actions/setup-gradle@v6 with version 8.14.3 to linux.yaml - Add gradle-version parameter to Windows gradle setup - Add cache: gradle to setup-java steps - Update Gradle command syntax to use --project-dir - Update upload-artifact to v7 --- .github/workflows/linux.yaml | 12 ++++++++++-- .github/workflows/windows.yaml | 5 ++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index b53a0d2c2ae0..a5609fc1a6fb 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -27,6 +27,7 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java }} + cache: gradle - uses: actions/cache@v5 with: @@ -50,6 +51,12 @@ jobs: java-version: ${{ matrix.java }} maven-version: 3.8.8 + - uses: gradle/actions/setup-gradle@v6 + with: + cache-disabled: true + gradle-version: '8.14.3' + validate-wrappers: false + - name: Build with Maven shell: bash run: ./mvnw clean -nsu -B --quiet -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress install --file pom.xml @@ -57,7 +64,7 @@ jobs: GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - name: Upload Maven build artifact - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v7 if: matrix.java == '11' && matrix.os == 'ubuntu-latest' with: name: artifact @@ -65,7 +72,7 @@ jobs: - name: Test Gradle plugin usage shell: bash - run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace + run: gradle --project-dir modules/openapi-generator-gradle-plugin/samples/local-spec buildGoSdk --stacktrace - name: Test Maven plugin integration if: matrix.java == '11' @@ -91,6 +98,7 @@ jobs: with: java-version: 11 maven-version: 3.8.8 + cache: gradle - name: Download build artifact uses: actions/download-artifact@v5 with: diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 59fac4c2f469..9a4b58128432 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -24,6 +24,7 @@ jobs: with: java-version: ${{ matrix.java }} distribution: 'temurin' + cache: gradle - name: Cache maven dependencies uses: actions/cache@v5 env: @@ -54,6 +55,8 @@ jobs: java -jar ./openapi-generator-cli.jar author template --verbose -g jaxrs-spec --library quarkus - name: Setup Gradle uses: gradle/gradle-build-action@v3 + with: + gradle-version: '8.14.3' - name: Gradle tests run: | - gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace + gradle --project-dir modules/openapi-generator-gradle-plugin/samples/local-spec buildGoSdk --stacktrace