Skip to content

Commit eba0c0f

Browse files
committed
Merge branch '6.3.x'
Closes gh-15669
2 parents ea24449 + fc01ebb commit eba0c0f

File tree

5 files changed

+44
-25
lines changed

5 files changed

+44
-25
lines changed

.github/workflows/continuous-integration-workflow.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,13 @@ jobs:
113113
artifact-path: org/springframework/security/spring-security-core
114114
slack-announcing-id: spring-security-announcing
115115
secrets: inherit
116-
notify_result:
117-
name: Check for failures
116+
send-notification:
117+
name: Send Notification
118118
needs: [ perform-release ]
119-
if: failure()
119+
if: ${{ failure() || cancelled() }}
120120
runs-on: ubuntu-latest
121-
permissions:
122-
actions: read
123121
steps:
124-
- name: Send Slack message
125-
# Workaround while waiting for Gamesight/slack-workflow-status#38 to be fixed
126-
# See https://github.com/Gamesight/slack-workflow-status/issues/38
127-
uses: sjohnr/slack-workflow-status@v1-beta
122+
- name: Send Notification
123+
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1
128124
with:
129-
repo_token: ${{ secrets.GITHUB_TOKEN }}
130-
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
131-
channel: '#spring-security-ci'
132-
name: 'CI Notifier'
125+
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}

.github/workflows/merge-dependabot-pr.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ permissions: write-all
88

99
jobs:
1010
merge-dependabot-pr:
11+
name: Merge Dependabot PR
1112
runs-on: ubuntu-latest
1213
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' }}
1314
steps:
@@ -50,3 +51,13 @@ jobs:
5051
run: gh pr merge ${{ github.event.pull_request.number }} --auto --rebase
5152
env:
5253
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
54+
send-notification:
55+
name: Send Notification
56+
needs: [ merge-dependabot-pr ]
57+
if: ${{ failure() || cancelled() }}
58+
runs-on: ubuntu-latest
59+
steps:
60+
- name: Send Notification
61+
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1
62+
with:
63+
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}

.github/workflows/milestone-spring-releasetrain.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,13 @@ jobs:
2323
export TOOL_VERSION=0.1.1
2424
wget "https://repo.maven.apache.org/maven2/io/spring/releasetrain/spring-release-train-tools/$TOOL_VERSION/spring-release-train-tools-$TOOL_VERSION.jar"
2525
java -cp "spring-release-train-tools-$TOOL_VERSION.jar" io.spring.releasetrain.CheckMilestoneDueOnMain --dueOn "$DUE_ON" --expectedDayOfWeek MONDAY --expectedMondayCount 3
26-
notify_result:
27-
name: Check for failures
28-
needs: [spring-releasetrain-checks]
29-
if: failure()
26+
send-notification:
27+
name: Send Notification
28+
needs: [ spring-releasetrain-checks ]
29+
if: ${{ failure() || cancelled() }}
3030
runs-on: ubuntu-latest
31-
permissions:
32-
actions: read
3331
steps:
34-
- name: Send Slack message
35-
uses: Gamesight/slack-workflow-status@v1.3.0
32+
- name: Send Notification
33+
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1
3634
with:
37-
repo_token: ${{ secrets.GITHUB_TOKEN }}
38-
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
39-
channel: '#spring-security-ci'
40-
name: 'CI Notifier'
35+
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}

.github/workflows/pr-build-workflow.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,13 @@ jobs:
4242
name: docs
4343
path: docs/build/site
4444
overwrite: true
45+
send-notification:
46+
name: Send Notification
47+
needs: [ build, generate-docs ]
48+
if: ${{ failure() && github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' }}
49+
runs-on: ubuntu-latest
50+
steps:
51+
- name: Send Notification
52+
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1
53+
with:
54+
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}

.github/workflows/update-scheduled-release-version.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,13 @@ jobs:
1111
name: Update Scheduled Release Version
1212
uses: spring-io/spring-security-release-tools/.github/workflows/update-scheduled-release-version.yml@v1
1313
secrets: inherit
14+
send-notification:
15+
name: Send Notification
16+
needs: [ update-scheduled-release-version ]
17+
if: ${{ failure() || cancelled() }}
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Send Notification
21+
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1
22+
with:
23+
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}

0 commit comments

Comments
 (0)