@@ -209,26 +209,11 @@ jobs:
209209 run : |
210210 echo "Tagging and publishing $REPO@$VERSION release on GitHub."
211211 ./gradlew createGitHubRelease -PnextVersion=$VERSION -Pbranch=$BRANCH -PcreateRelease=true -PgitHubAccessToken=$TOKEN
212- - name : Announce Release on Slack
213- id : spring-security-announcing
214- 215- with :
216- payload : |
217- {
218- "text": "spring-security-announcing `${{ env.VERSION }}` is available now",
219- "blocks": [
220- {
221- "type": "section",
222- "text": {
223- "type": "mrkdwn",
224- "text": "spring-security-announcing `${{ env.VERSION }}` is available now"
225- }
226- }
227- ]
228- }
212+ - name : Announce Release on GChat
229213 env :
230- SLACK_WEBHOOK_URL : ${{ secrets.SPRING_RELEASE_SLACK_WEBHOOK_URL }}
231- SLACK_WEBHOOK_TYPE : INCOMING_WEBHOOK
214+ WEBHOOK_URL : ${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }}
215+ run : |
216+ curl -X POST '$WEBHOOK_URL' -H 'Content-Type: application/json' -d '{ text: "spring-security-announcing `$VERSION` is available now" }' || true
232217 - name : Setup git config
233218 run : |
234219 git config user.name 'github-actions[bot]'
@@ -260,20 +245,16 @@ jobs:
260245 distribution : ' adopt'
261246 - name : Schedule next release (if not already scheduled)
262247 run : ./gradlew scheduleNextRelease -PnextVersion=$VERSION -PgitHubAccessToken=$TOKEN
263- notify_result :
264- name : Check for failures
265- needs : [perform_release, perform_post_release ]
248+ send-notification :
249+ name : Send Notification
250+ needs : [ perform-release ]
266251 if : failure()
267252 runs-on : ubuntu-latest
268- permissions :
269- actions : read
270253 steps :
271- - name : Send Slack message
272- # Workaround while waiting for Gamesight/slack-workflow-status#38 to be fixed
273- # See https://github.com/Gamesight/slack-workflow-status/issues/38
274- uses : sjohnr/slack-workflow-status@v1-beta
254+ - name : Send Notification
255+ uses : spring-io/spring-security-release-tools/.github/actions/send-notification@v1
275256 with :
276- repo_token : ${{ secrets.GITHUB_TOKEN }}
277- slack_webhook_url : ${{ secrets.SLACK_WEBHOOK_URL }}
278- channel : ' #spring-security-ci '
279- name : ' CI Notifier '
257+ webhook-url : ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}
258+ status : ${{ job.status }}
259+ build-scan-url : ${{ steps.build-and-publish.outputs.build-scan-url }}
260+ run- name : ${{ format('spring-security/{0}', github.ref_name) }}
0 commit comments