mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-06-25 21:42:17 +00:00
Merge branch '6.3.x'
Closes gh-15669
This commit is contained in:
commit
eba0c0f20c
@ -113,20 +113,13 @@ 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
|
||||||
notify_result:
|
send-notification:
|
||||||
name: Check for failures
|
name: Send Notification
|
||||||
needs: [ perform-release ]
|
needs: [ perform-release ]
|
||||||
if: failure()
|
if: ${{ failure() || cancelled() }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
|
||||||
actions: read
|
|
||||||
steps:
|
steps:
|
||||||
- name: Send Slack message
|
- name: Send Notification
|
||||||
# Workaround while waiting for Gamesight/slack-workflow-status#38 to be fixed
|
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1
|
||||||
# See https://github.com/Gamesight/slack-workflow-status/issues/38
|
|
||||||
uses: sjohnr/slack-workflow-status@v1-beta
|
|
||||||
with:
|
with:
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}
|
||||||
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
|
|
||||||
channel: '#spring-security-ci'
|
|
||||||
name: 'CI Notifier'
|
|
||||||
|
11
.github/workflows/merge-dependabot-pr.yml
vendored
11
.github/workflows/merge-dependabot-pr.yml
vendored
@ -8,6 +8,7 @@ permissions: write-all
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
merge-dependabot-pr:
|
merge-dependabot-pr:
|
||||||
|
name: Merge Dependabot PR
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' }}
|
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'spring-projects/spring-security' }}
|
||||||
steps:
|
steps:
|
||||||
@ -50,3 +51,13 @@ jobs:
|
|||||||
run: gh pr merge ${{ github.event.pull_request.number }} --auto --rebase
|
run: gh pr merge ${{ github.event.pull_request.number }} --auto --rebase
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
|
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 }}
|
||||||
|
@ -23,18 +23,13 @@ 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
|
||||||
notify_result:
|
send-notification:
|
||||||
name: Check for failures
|
name: Send Notification
|
||||||
needs: [spring-releasetrain-checks]
|
needs: [ spring-releasetrain-checks ]
|
||||||
if: failure()
|
if: ${{ failure() || cancelled() }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
|
||||||
actions: read
|
|
||||||
steps:
|
steps:
|
||||||
- name: Send Slack message
|
- name: Send Notification
|
||||||
uses: Gamesight/slack-workflow-status@v1.3.0
|
uses: spring-io/spring-security-release-tools/.github/actions/send-notification@v1
|
||||||
with:
|
with:
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
webhook-url: ${{ secrets.SPRING_SECURITY_CI_GCHAT_WEBHOOK_URL }}
|
||||||
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
|
|
||||||
channel: '#spring-security-ci'
|
|
||||||
name: 'CI Notifier'
|
|
||||||
|
10
.github/workflows/pr-build-workflow.yml
vendored
10
.github/workflows/pr-build-workflow.yml
vendored
@ -42,3 +42,13 @@ jobs:
|
|||||||
name: docs
|
name: docs
|
||||||
path: docs/build/site
|
path: docs/build/site
|
||||||
overwrite: true
|
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 }}
|
||||||
|
@ -11,3 +11,13 @@ jobs:
|
|||||||
name: Update Scheduled Release Version
|
name: Update Scheduled Release Version
|
||||||
uses: spring-io/spring-security-release-tools/.github/workflows/update-scheduled-release-version.yml@v1
|
uses: spring-io/spring-security-release-tools/.github/workflows/update-scheduled-release-version.yml@v1
|
||||||
secrets: inherit
|
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 }}
|
Loading…
x
Reference in New Issue
Block a user