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 '5.7.x' into 5.8.x 

Closes gh-12298
This commit is contained in:
Marcus Da Coregio 2022-11-25 09:22:27 -03:00
parent 5db7ac4ce3 c2e86ad067
commit 08afa1782c
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,15 +31,15 @@ jobs:
runjobs: ${{ steps.continue.outputs.runjobs }} runjobs: ${{ steps.continue.outputs.runjobs }}
project_version: ${{ steps.continue.outputs.project_version }} project_version: ${{ steps.continue.outputs.project_version }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- id: continue - id: continue
name: Determine if should continue name: Determine if should continue
run: | run: |
# Run jobs if in upstream repository # Run jobs if in upstream repository
echo "::set-output name=runjobs::true" echo "runjobs=true" >>$GITHUB_OUTPUT
# Extract version from gradle.properties # Extract version from gradle.properties
version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}') version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
echo "::set-output name=project_version::$version" echo "project_version=$version" >>$GITHUB_OUTPUT
build_jdk_11: build_jdk_11:
name: Build JDK 11 name: Build JDK 11
needs: [prerequisites] needs: [prerequisites]
@ -49,9 +49,9 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
if: needs.prerequisites.outputs.runjobs if: needs.prerequisites.outputs.runjobs
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up JDK 11 - name: Set up JDK 11
uses: actions/setup-java@v2 uses: actions/setup-java@v3
with: with:
java-version: '11' java-version: '11'
distribution: 'adopt' distribution: 'adopt'
@ -71,7 +71,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: needs.prerequisites.outputs.runjobs if: needs.prerequisites.outputs.runjobs
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up gradle - name: Set up gradle
uses: spring-io/spring-gradle-build-action@v1 uses: spring-io/spring-gradle-build-action@v1
with: with:
@ -89,7 +89,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: needs.prerequisites.outputs.runjobs if: needs.prerequisites.outputs.runjobs
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up gradle - name: Set up gradle
uses: spring-io/spring-gradle-build-action@v1 uses: spring-io/spring-gradle-build-action@v1
with: with:
@ -113,7 +113,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: needs.prerequisites.outputs.runjobs if: needs.prerequisites.outputs.runjobs
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up gradle - name: Set up gradle
uses: spring-io/spring-gradle-build-action@v1 uses: spring-io/spring-gradle-build-action@v1
with: with:
@ -130,7 +130,7 @@ jobs:
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles] needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up gradle - name: Set up gradle
uses: spring-io/spring-gradle-build-action@v1 uses: spring-io/spring-gradle-build-action@v1
with: with:
@ -154,7 +154,7 @@ jobs:
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles] needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up gradle - name: Set up gradle
uses: spring-io/spring-gradle-build-action@v1 uses: spring-io/spring-gradle-build-action@v1
with: with:
@ -175,7 +175,7 @@ jobs:
needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles] needs: [build_jdk_11, snapshot_tests, check_samples, check_tangles]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up gradle - name: Set up gradle
uses: spring-io/spring-gradle-build-action@v1 uses: spring-io/spring-gradle-build-action@v1
with: with:
@ -205,7 +205,7 @@ jobs:
TOKEN: ${{ github.token }} TOKEN: ${{ github.token }}
VERSION: ${{ needs.prerequisites.outputs.project_version }} VERSION: ${{ needs.prerequisites.outputs.project_version }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
- name: Set up gradle - name: Set up gradle
@ -286,7 +286,7 @@ jobs:
TOKEN: ${{ github.token }} TOKEN: ${{ github.token }}
VERSION: ${{ needs.prerequisites.outputs.project_version }} VERSION: ${{ needs.prerequisites.outputs.project_version }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up gradle - name: Set up gradle
uses: spring-io/spring-gradle-build-action@v1 uses: spring-io/spring-gradle-build-action@v1
with: with:

2
.github/workflows/pr-build-workflow.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.repository == 'spring-projects/spring-security' }} if: ${{ github.repository == 'spring-projects/spring-security' }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up gradle - name: Set up gradle
uses: spring-io/spring-gradle-build-action@v1 uses: spring-io/spring-gradle-build-action@v1
with: with:

6
.github/workflows/update-scheduled-release-version.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
steps: steps:
- id: checkout-source - id: checkout-source
name: Checkout Source Code name: Checkout Source Code
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
- name: Set up gradle - name: Set up gradle
@ -38,7 +38,7 @@ jobs:
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
./gradlew gitHubCheckNextVersionDueToday ./gradlew gitHubCheckNextVersionDueToday
echo "::set-output name=is_due_today::$(cat build/github/milestones/is-due-today)" echo "is_due_today=$(cat build/github/milestones/is-due-today)" >>$GITHUB_OUTPUT
- id: check-open-issues - id: check-open-issues
name: Check for open issues name: Check for open issues
if: steps.check-release-due.outputs.is_due_today == 'true' if: steps.check-release-due.outputs.is_due_today == 'true'
@ -47,7 +47,7 @@ jobs:
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
./gradlew gitHubCheckMilestoneHasNoOpenIssues ./gradlew gitHubCheckMilestoneHasNoOpenIssues
echo "::set-output name=is_open_issues::$(cat build/github/milestones/is-open-issues)" echo "is_open_issues=$(cat build/github/milestones/is-open-issues)" >>$GITHUB_OUTPUT
- id: validate-release-state - id: validate-release-state
name: Validate State of Release name: Validate State of Release
if: steps.check-release-due.outputs.is_due_today == 'true' && steps.check-open-issues.outputs.is_open_issues == 'true' if: steps.check-release-due.outputs.is_due_today == 'true' && steps.check-open-issues.outputs.is_open_issues == 'true'