diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index b3bbba2458..cff9af47f3 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -113,20 +113,13 @@ 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() + if: ${{ failure() || cancelled() }} 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 }} diff --git a/.github/workflows/merge-dependabot-pr.yml b/.github/workflows/merge-dependabot-pr.yml index 9c614bc866..4f2168eb3b 100644 --- a/.github/workflows/merge-dependabot-pr.yml +++ b/.github/workflows/merge-dependabot-pr.yml @@ -8,6 +8,7 @@ permissions: write-all jobs: merge-dependabot-pr: + name: Merge Dependabot PR runs-on: ubuntu-latest if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' }} steps: @@ -50,3 +51,13 @@ jobs: run: gh pr merge ${{ github.event.pull_request.number }} --auto --rebase env: GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} + send-notification: + name: Send Notification + needs: [ merge-dependabot-pr ] + if: ${{ failure() || cancelled() }} + runs-on: ubuntu-latest + steps: + - name: Send Notification + uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 + with: + webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} diff --git a/.github/workflows/milestone-spring-releasetrain.yml b/.github/workflows/milestone-spring-releasetrain.yml index 87d1ab287e..0602ae8e73 100644 --- a/.github/workflows/milestone-spring-releasetrain.yml +++ b/.github/workflows/milestone-spring-releasetrain.yml @@ -23,18 +23,13 @@ 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] - if: failure() + send-notification: + name: Send Notification + needs: [ spring-releasetrain-checks ] + if: ${{ failure() || cancelled() }} 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 }} diff --git a/.github/workflows/pr-build-workflow.yml b/.github/workflows/pr-build-workflow.yml index 38ba42600b..6d56bc9d91 100644 --- a/.github/workflows/pr-build-workflow.yml +++ b/.github/workflows/pr-build-workflow.yml @@ -42,3 +42,13 @@ jobs: name: docs path: docs/build/site overwrite: true + send-notification: + name: Send Notification + needs: [ build, generate-docs ] + if: ${{ failure() && github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' }} + runs-on: ubuntu-latest + steps: + - name: Send Notification + uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 + with: + webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} diff --git a/.github/workflows/update-scheduled-release-version.yml b/.github/workflows/update-scheduled-release-version.yml index cc67c2f37f..665b1b50b6 100644 --- a/.github/workflows/update-scheduled-release-version.yml +++ b/.github/workflows/update-scheduled-release-version.yml @@ -11,3 +11,13 @@ jobs: name: Update Scheduled Release Version uses: spring-io/spring-security-release-tools/.github/workflows/update-scheduled-release-version.yml@v1 secrets: inherit + send-notification: + name: Send Notification + needs: [ update-scheduled-release-version ] + if: ${{ failure() || cancelled() }} + runs-on: ubuntu-latest + steps: + - name: Send Notification + uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 + with: + webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} \ No newline at end of file