Replace manual caching and wrapper-validation with setup-gradle action

FirebirdSQL · Oct 1, 2024 · cf7b6a1 · cf7b6a1
1 parent b8fd4c9
commit cf7b6a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -26,19 +26,10 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
-        cache: gradle
-    - name: Validate Gradle wrapper
-      uses: gradle/wrapper-validation-action@85cde3f5a1033b2adc2442631c24b530f1183a1a
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
     - name: Build with Gradle
       run: ./gradlew assemble
-    - 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
-        rm -fr ~/.gradle/caches/*/plugin-resolution/
-        find ~/.gradle/caches/ -name "*.lock" -type f -delete
     - name: build artifact
       uses: actions/upload-artifact@v4
       with:

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -21,19 +21,10 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-          cache: gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@85cde3f5a1033b2adc2442631c24b530f1183a1a
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
       - name: Build with Gradle
         run: ./gradlew javadoc
-      - 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
-          rm -fr ~/.gradle/caches/*/plugin-resolution/
-          find ~/.gradle/caches/ -name "*.lock" -type f -delete
       - name: build artifact
         uses: actions/upload-artifact@v4
         with: