From 4165fe138bf479b20d008b9c6264bbc4c9454a84 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Wed, 21 Jan 2026 12:59:28 -0700
Subject: [PATCH 1/2] Use spring-release-actions/announce-on-gchat

Uses common action for GChat release announcements

Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
---
 .github/workflows/spring-finalize-release.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/spring-finalize-release.yml b/.github/workflows/spring-finalize-release.yml
index 2e81302..0a11a19 100644
--- a/.github/workflows/spring-finalize-release.yml
+++ b/.github/workflows/spring-finalize-release.yml
@@ -121,11 +121,12 @@ jobs:
           token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
 
       - name: Announce Release in Chat
-        if: env.CHAT_WEBHOOK_URL
-        run: |
-          curl -X POST '${{ env.CHAT_WEBHOOK_URL }}' -H 'Content-Type: application/json' -d '{ text: "${{ github.event.repository.name }}-announcing `${{ inputs.milestone }}`"}'
-        env:
-          CHAT_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_CHAT_WEBHOOK_URL }}
+        if: secrets.SPRING_RELEASE_CHAT_WEBHOOK_URL != ''
+        uses: spring-io/spring-release-actions/announce-on-gchat@0.0.1
+        with:
+          gchat-webhook-url: ${{ secrets.SPRING_RELEASE_CHAT_WEBHOOK_URL }}
+          project-name: ${{ github.event.repository.name }}
+          version: ${{ inputs.milestone }}
 
 #      - name: Announce Release on Slack
 #        uses: slackapi/slack-github-action@v1.26.0

From e9b070375667c6ae8f7d1782a2fca0b53c13d4ae Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Fri, 23 Jan 2026 07:51:00 -0700
Subject: [PATCH 2/2] Respond to Feedback

This commit restores the original conditional, given that
secrets are not accessible in conditionals. It also relies
on the announce-to-gchat project name defaut
---
 .github/workflows/spring-finalize-release.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/spring-finalize-release.yml b/.github/workflows/spring-finalize-release.yml
index 0a11a19..3bf23a2 100644
--- a/.github/workflows/spring-finalize-release.yml
+++ b/.github/workflows/spring-finalize-release.yml
@@ -121,12 +121,13 @@ jobs:
           token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
 
       - name: Announce Release in Chat
-        if: secrets.SPRING_RELEASE_CHAT_WEBHOOK_URL != ''
+        if: env.CHAT_WEBHOOK_URL
         uses: spring-io/spring-release-actions/announce-on-gchat@0.0.1
         with:
-          gchat-webhook-url: ${{ secrets.SPRING_RELEASE_CHAT_WEBHOOK_URL }}
-          project-name: ${{ github.event.repository.name }}
+          gchat-webhook-url: ${{ env.CHAT_WEBHOOK_URL }}
           version: ${{ inputs.milestone }}
+        env:
+          CHAT_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_CHAT_WEBHOOK_URL }}
 
 #      - name: Announce Release on Slack
 #        uses: slackapi/slack-github-action@v1.26.0
@@ -138,4 +139,4 @@ jobs:
 #          payload: |
 #            {
 #              "text": "${{ github.event.repository.name }}-announcing `${{ inputs.milestone }}`"
-#            }
\ No newline at end of file
+#            }