Merge pull request #126 from opengood-aio/github-actions-refactor

Update Gradle release workflows with official Gradle actions
opengood-aio · Aug 8, 2024 · 26496b3 · 26496b3
2 parents 8641421 + 7f73f34
commit 26496b3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/.github/workflows/gradle-github-release.yml b/.github/workflows/gradle-github-release.yml
@@ -42,10 +42,6 @@ jobs:
           persist-credentials: false
           token: ${{ secrets.workflow-token }}
 
-      - name: Validate Gradle Wrapper
-        if: ${{ inputs.run-gradle-validation == true }}
-        uses: gradle/wrapper-validation-action@v3.5.0
-
       - name: Setup Git
         run: |
           git config user.email ${GIT_EMAIL}
@@ -61,11 +57,13 @@ jobs:
           java-version: ${{ inputs.java-version }}
           distribution: ${{ inputs.java-distribution }}
 
-      - name: Release and Publish
-        uses: burrunan/gradle-cache-action@v1
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3.5.0
         with:
-          arguments: clean release -PskipTests=true -Prelease.useAutomaticVersion=true
-          gradle-version: wrapper
+          validate-wrappers: ${{ inputs.run-gradle-validation }}
+
+      - name: Release and Publish
+        run: ./gradlew clean release -PskipTests=true -Prelease.useAutomaticVersion=true
         env:
           GITHUB_USER: ${{ inputs.git-user }}
           GITHUB_TOKEN: ${{ secrets.workflow-token }}
diff --git a/.github/workflows/gradle-maven-central-release.yml b/.github/workflows/gradle-maven-central-release.yml
@@ -57,10 +57,6 @@ jobs:
           persist-credentials: false
           token: ${{ secrets.workflow-token }}
 
-      - name: Validate Gradle Wrapper
-        if: ${{ inputs.run-gradle-validation == true }}
-        uses: gradle/wrapper-validation-action@v3.5.0
-
       - name: Setup Git
         run: |
           git config user.email ${GIT_EMAIL}
@@ -76,11 +72,13 @@ jobs:
           java-version: ${{ inputs.java-version }}
           distribution: ${{ inputs.java-distribution }}
 
-      - name: Release and Publish
-        uses: burrunan/gradle-cache-action@v1
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3.5.0
         with:
-          arguments: clean release -PskipTests=true -Prelease.useAutomaticVersion=true
-          gradle-version: wrapper
+          validate-wrappers: ${{ inputs.run-gradle-validation }}
+
+      - name: Release and Publish
+        run: ./gradlew clean release -PskipTests=true -Prelease.useAutomaticVersion=true
         env:
           GITHUB_TOKEN: ${{ secrets.workflow-token }}
           ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.gpg-signing-key-id }}

diff --git a/.github/workflows/gradle-plugin-release.yml b/.github/workflows/gradle-plugin-release.yml
@@ -48,10 +48,6 @@ jobs:
           persist-credentials: false
           token: ${{ secrets.workflow-token }}
 
-      - name: Validate Gradle Wrapper
-        if: ${{ inputs.run-gradle-validation == true }}
-        uses: gradle/wrapper-validation-action@v3.5.0
-
       - name: Setup Git
         run: |
           git config user.email ${GIT_EMAIL}
@@ -67,11 +63,13 @@ jobs:
           java-version: ${{ inputs.java-version }}
           distribution: ${{ inputs.java-distribution }}
 
-      - name: Release and Publish
-        uses: burrunan/gradle-cache-action@v1
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3.5.0
         with:
-          arguments: clean release -PskipTests=true -Prelease.useAutomaticVersion=true
-          gradle-version: wrapper
+          validate-wrappers: ${{ inputs.run-gradle-validation }}
+
+      - name: Release and Publish
+        run: ./gradlew clean release -PskipTests=true -Prelease.useAutomaticVersion=true
         env:
           GITHUB_TOKEN: ${{ secrets.workflow-token }}
           GRADLE_PUBLISH_KEY: ${{ secrets.gradle-publish-key }}