Skip to content

Commit dae2674

Browse files
committed
Merge branch '5.8.x' into 6.2.x
Closes gh-15504
2 parents e51507e + a5b1dec commit dae2674

File tree

2 files changed

+18
-24
lines changed

2 files changed

+18
-24
lines changed

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,16 @@ 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 ]
119119
if: failure()
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 }}
126+
status: ${{ job.status }}
127+
build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }}
128+
run-name: ${{ format('spring-security/{0}', github.ref_name) }}

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
permissions:
99
contents: read
1010
jobs:
11-
spring-releasetrain-checks:
11+
spring-releasetrain-checks:
1212
name: Check DueOn is on a Release Date
1313
runs-on: ubuntu-latest
1414
if: ${{ github.repository == 'spring-projects/spring-security' }}
@@ -23,18 +23,16 @@ 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]
26+
send-notification:
27+
name: Send Notification
28+
needs: [ spring-releasetrain-checks ]
2929
if: failure()
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 }}
36+
status: ${{ job.status }}
37+
build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }}
38+
run-name: ${{ format('spring-security/{0}', github.ref_name) }}

0 commit comments

Comments
 (0)