diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index b3bbba2458..e0cb08bab3 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -113,20 +113,16 @@ jobs: artifact-path: org/springframework/security/spring-security-core slack-announcing-id: spring-security-announcing secrets: inherit - notify_result: - name: Check for failures + send-notification: + name: Send Notification needs: [ perform-release ] if: failure() runs-on: ubuntu-latest - permissions: - actions: read steps: - - name: Send Slack message - # Workaround while waiting for Gamesight/slack-workflow-status#38 to be fixed - # See https://github.com/Gamesight/slack-workflow-status/issues/38 - uses: sjohnr/slack-workflow-status@v1-beta + - name: Send Notification + uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }} - channel: '#spring-security-ci' - name: 'CI Notifier' + webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} + status: ${{ job.status }} + build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} + run-name: ${{ format('spring-security/{0}', github.ref_name) }} diff --git a/.github/workflows/milestone-spring-releasetrain.yml b/.github/workflows/milestone-spring-releasetrain.yml index 87d1ab287e..44a2c11356 100644 --- a/.github/workflows/milestone-spring-releasetrain.yml +++ b/.github/workflows/milestone-spring-releasetrain.yml @@ -8,7 +8,7 @@ env: permissions: contents: read jobs: - spring-releasetrain-checks: + spring-releasetrain-checks: name: Check DueOn is on a Release Date runs-on: ubuntu-latest if: ${{ github.repository == 'spring-projects/spring-security' }} @@ -23,18 +23,16 @@ jobs: export TOOL_VERSION=0.1.1 wget "https://repo.maven.apache.org/maven2/io/spring/releasetrain/spring-release-train-tools/$TOOL_VERSION/spring-release-train-tools-$TOOL_VERSION.jar" java -cp "spring-release-train-tools-$TOOL_VERSION.jar" io.spring.releasetrain.CheckMilestoneDueOnMain --dueOn "$DUE_ON" --expectedDayOfWeek MONDAY --expectedMondayCount 3 - notify_result: - name: Check for failures - needs: [spring-releasetrain-checks] + send-notification: + name: Send Notification + needs: [ spring-releasetrain-checks ] if: failure() runs-on: ubuntu-latest - permissions: - actions: read steps: - - name: Send Slack message - uses: Gamesight/slack-workflow-status@v1.3.0 + - name: Send Notification + uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }} - channel: '#spring-security-ci' - name: 'CI Notifier' + webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} + status: ${{ job.status }} + build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} + run-name: ${{ format('spring-security/{0}', github.ref_name) }}