From 5083e83c1b72a2477cc5743e2f0618c6f38852d1 Mon Sep 17 00:00:00 2001
From: Puneet Behl <behlp@unityfoundation.io>
Date: Wed, 6 Dec 2023 13:00:50 +0530
Subject: [PATCH] Update GitHub Workflow Config (#880)

- Update email address
- Skip Latest and Snapshot for 5.3.x branch
---
 .github/actions/tag-and-release/entrypoint.sh |  5 ++---
 .github/workflows/gradle.yml                  | 11 ++++-------
 .github/workflows/release.yml                 |  6 ++----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/actions/tag-and-release/entrypoint.sh b/.github/actions/tag-and-release/entrypoint.sh
index 2f2f2a92a7..27a3e97711 100755
--- a/.github/actions/tag-and-release/entrypoint.sh
+++ b/.github/actions/tag-and-release/entrypoint.sh
@@ -29,6 +29,5 @@ echo "Pushing release version and recreating v${grails_version} tag"
 git add gradle.properties
 git commit -m "[skip ci] Release v${grails_version} docs"
 git push origin $TARGET_BRANCH
-git push origin :refs/tags/v${grails_version}
-git tag -fa v${grails_version} -m "[skip ci] Release v${grails_version} docs"
-git push origin $TARGET_BRANCH --tags
+git tag -fa v${grails_version} -m "Release v${grails_version} docs"
+git push -f origin v${grails_version}
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 668655010d..2bffe3cec2 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -7,12 +7,9 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: ['8']
     env:
       GIT_USER_NAME: puneetbehl
-      GIT_USER_EMAIL: behlp@objectcomputing.com
+      GIT_USER_EMAIL: behlp@unityfoundation.io
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -22,7 +19,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 8
       - name: Publish Documentation
         run: |
           ./gradlew --stop
@@ -41,13 +38,13 @@ jobs:
         run: echo ::set-output name=value::${GITHUB_REF:11}
       - name: Publish to Github Pages
         if: success()
-        uses: micronaut-projects/github-pages-deploy-action@grails
+        uses: grails/github-pages-deploy-action@v2
         env:
           TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           BRANCH: gh-pages
-          OLDER_VERSION: ${{ startsWith(steps.extract_branch.outputs.value, '3.3') || startsWith(steps.extract_branch.outputs.value, '4.1') }}
           SKIP_SNAPSHOT: true
+          SKIP_LATEST: true
           FOLDER: build/docs
           DOC_FOLDER: gh-pages
           COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a3657ffc49..3025413c17 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,10 +12,8 @@ jobs:
       matrix:
         java: ['8']
     env:
-      BETA: ${{ contains(github.event.inputs.grails_version, 'M') || contains(github.event.inputs.grails_version, 'RC') }}
-      OLDER_VERSION: ${{ startsWith(github.event.inputs.grails_version, '3.3') || startsWith(github.event.inputs.grails_version, '4.1') }}
       GIT_USER_NAME: puneetbehl
-      GIT_USER_EMAIL: behlp@objectcomputing.com
+      GIT_USER_EMAIL: behlp@unityfoundation.io
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -87,7 +85,7 @@ jobs:
           if_false: ${{ github.repository }}
       - name: Publish to Github Pages
         if: success()
-        uses: micronaut-projects/github-pages-deploy-action@grails
+        uses: grails/github-pages-deploy-action@v2
         env:
           TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}