From a9c987c3fa5b8b373bfb375fb6ccdacf0ee8f4a8 Mon Sep 17 00:00:00 2001 From: Roy Clarkson Date: Wed, 28 May 2025 13:26:06 -0400 Subject: [PATCH] Update actions to use latest Gradle plugins Signed-off-by: Roy Clarkson --- .github/workflows/java-11.yml | 21 +++------------------ .github/workflows/java-17.yml | 21 +++------------------ .github/workflows/java-21.yml | 21 +++------------------ .github/workflows/java-8.yml | 21 +++------------------ 4 files changed, 12 insertions(+), 72 deletions(-) diff --git a/.github/workflows/java-11.yml b/.github/workflows/java-11.yml index 45fdc090..2e321fe6 100644 --- a/.github/workflows/java-11.yml +++ b/.github/workflows/java-11.yml @@ -15,27 +15,12 @@ jobs: name: Java 11 build steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up Java 11 uses: actions/setup-java@v4 with: java-version: 11 distribution: liberica - - name: Cache Gradle packages - uses: actions/cache@v4 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle run: ./gradlew build - - name: Cleanup Gradle Cache - # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. - # Restoring these files from a GitHub Actions cache might cause problems for future builds. - run: | - rm -f ~/.gradle/caches/modules-2/modules-2.lock - rm -f ~/.gradle/caches/modules-2/gc.properties diff --git a/.github/workflows/java-17.yml b/.github/workflows/java-17.yml index 9fbd4dfa..63b109b4 100644 --- a/.github/workflows/java-17.yml +++ b/.github/workflows/java-17.yml @@ -15,27 +15,12 @@ jobs: name: Java 17 build steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up Java 17 uses: actions/setup-java@v4 with: java-version: 17 distribution: liberica - - name: Cache Gradle packages - uses: actions/cache@v4 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle run: ./gradlew build - - name: Cleanup Gradle Cache - # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. - # Restoring these files from a GitHub Actions cache might cause problems for future builds. - run: | - rm -f ~/.gradle/caches/modules-2/modules-2.lock - rm -f ~/.gradle/caches/modules-2/gc.properties diff --git a/.github/workflows/java-21.yml b/.github/workflows/java-21.yml index 49945238..743827a5 100644 --- a/.github/workflows/java-21.yml +++ b/.github/workflows/java-21.yml @@ -15,27 +15,12 @@ jobs: name: Java 21 build steps: - uses: actions/checkout@v4 - - name: Set up JDK 21 + - name: Set up Java 21 uses: actions/setup-java@v4 with: java-version: 21 distribution: liberica - - name: Cache Gradle packages - uses: actions/cache@v4 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle run: ./gradlew build - - name: Cleanup Gradle Cache - # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. - # Restoring these files from a GitHub Actions cache might cause problems for future builds. - run: | - rm -f ~/.gradle/caches/modules-2/modules-2.lock - rm -f ~/.gradle/caches/modules-2/gc.properties diff --git a/.github/workflows/java-8.yml b/.github/workflows/java-8.yml index 5d7c9639..8bdd8676 100644 --- a/.github/workflows/java-8.yml +++ b/.github/workflows/java-8.yml @@ -15,27 +15,12 @@ jobs: name: Java 8 build steps: - uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up Java 8 uses: actions/setup-java@v4 with: java-version: 8 distribution: liberica - - name: Cache Gradle packages - uses: actions/cache@v4 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle run: ./gradlew build - - name: Cleanup Gradle Cache - # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. - # Restoring these files from a GitHub Actions cache might cause problems for future builds. - run: | - rm -f ~/.gradle/caches/modules-2/modules-2.lock - rm -f ~/.gradle/caches/modules-2/gc.properties