Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x' into 6.3.x

This commit is contained in:
Steve Riesenberg 2024-08-09 10:51:23 -05:00
parent e66464344f 5be8322f7a
commit 8ecd89b451
No known key found for this signature in database
GPG Key ID: 3D0169B18AB8F0A9
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/continuous-integration-workflow.yml vendored
View File

@ -113,16 +113,20 @@ jobs:
artifact-path: org/springframework/security/spring-security-core artifact-path: org/springframework/security/spring-security-core
slack-announcing-id: spring-security-announcing slack-announcing-id: spring-security-announcing
secrets: inherit secrets: inherit
send-notification: notify_result:
name: Send Notification name: Check for failures
needs: [ perform-release ] needs: [ perform-release ]
if: failure() if: failure()
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
actions: read
steps: steps:
- name: Send Notification - name: Send Slack message
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 # 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
with: with:
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} repo_token: ${{ secrets.GITHUB_TOKEN }}
status: ${{ job.status }} slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} channel: '#spring-security-ci'
run-name: ${{ format('spring-security/{0}', github.ref_name) }} name: 'CI Notifier'

22
.github/workflows/milestone-spring-releasetrain.yml vendored
View File

@ -8,7 +8,7 @@ env:
permissions: permissions:
contents: read contents: read
jobs: jobs:
spring-releasetrain-checks: spring-releasetrain-checks:
name: Check DueOn is on a Release Date name: Check DueOn is on a Release Date
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.repository == 'spring-projects/spring-security' }} if: ${{ github.repository == 'spring-projects/spring-security' }}
@ -23,16 +23,18 @@ jobs:
export TOOL_VERSION=0.1.1 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" 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 java -cp "spring-release-train-tools-$TOOL_VERSION.jar" io.spring.releasetrain.CheckMilestoneDueOnMain --dueOn "$DUE_ON" --expectedDayOfWeek MONDAY --expectedMondayCount 3
send-notification: notify_result:
name: Send Notification name: Check for failures
needs: [ spring-releasetrain-checks ] needs: [spring-releasetrain-checks]
if: failure() if: failure()
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
actions: read
steps: steps:
- name: Send Notification - name: Send Slack message
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1 uses: Gamesight/slack-workflow-status@v1.3.0
with: with:
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }} repo_token: ${{ secrets.GITHUB_TOKEN }}
status: ${{ job.status }} slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }} channel: '#spring-security-ci'
run-name: ${{ format('spring-security/{0}', github.ref_name) }} name: 'CI Notifier'