|
@@ -41,29 +41,29 @@ jobs:
|
|
java-version: ${{ matrix.java-version }}
|
|
java-version: ${{ matrix.java-version }}
|
|
test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=6.2.+ -PreactorVersion=2023.0.+ -PspringDataVersion=2024.0.+ --stacktrace
|
|
test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=6.2.+ -PreactorVersion=2023.0.+ -PspringDataVersion=2024.0.+ --stacktrace
|
|
secrets: inherit
|
|
secrets: inherit
|
|
-# check-samples:
|
|
|
|
-# name: Check Samples
|
|
|
|
-# runs-on: ubuntu-latest
|
|
|
|
-# if: ${{ github.repository_owner == 'spring-projects' }}
|
|
|
|
-# steps:
|
|
|
|
-# - uses: actions/checkout@v4
|
|
|
|
-# - name: Set up gradle
|
|
|
|
-# uses: spring-io/spring-gradle-build-action@v2
|
|
|
|
-# with:
|
|
|
|
-# java-version: 17
|
|
|
|
-# distribution: temurin
|
|
|
|
-# - name: Check samples project
|
|
|
|
-# env:
|
|
|
|
-# LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos
|
|
|
|
-# SAMPLES_DIR: ../spring-security-samples
|
|
|
|
-# run: |
|
|
|
|
-# # Extract version from gradle.properties
|
|
|
|
-# version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
|
|
|
|
-# # Extract samplesBranch from gradle.properties
|
|
|
|
-# samples_branch=$(cat gradle.properties | grep "samplesBranch=" | awk -F'=' '{print $2}')
|
|
|
|
-# ./gradlew publishMavenJavaPublicationToLocalRepository
|
|
|
|
-# ./gradlew cloneRepository -PrepositoryName="spring-projects/spring-security-samples" -Pref="$samples_branch" -PcloneOutputDirectory="$SAMPLES_DIR"
|
|
|
|
-# ./gradlew --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$version" :runAllTests
|
|
|
|
|
|
+ check-samples:
|
|
|
|
+ name: Check Samples
|
|
|
|
+ runs-on: ubuntu-latest
|
|
|
|
+ if: ${{ github.repository_owner == 'spring-projects' }}
|
|
|
|
+ steps:
|
|
|
|
+ - uses: actions/checkout@v4
|
|
|
|
+ - name: Set up gradle
|
|
|
|
+ uses: spring-io/spring-gradle-build-action@v2
|
|
|
|
+ with:
|
|
|
|
+ java-version: 17
|
|
|
|
+ distribution: temurin
|
|
|
|
+ - name: Check samples project
|
|
|
|
+ env:
|
|
|
|
+ LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos
|
|
|
|
+ SAMPLES_DIR: ../spring-security-samples
|
|
|
|
+ run: |
|
|
|
|
+ # Extract version from gradle.properties
|
|
|
|
+ version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
|
|
|
|
+ # Extract samplesBranch from gradle.properties
|
|
|
|
+ samples_branch=$(cat gradle.properties | grep "samplesBranch=" | awk -F'=' '{print $2}')
|
|
|
|
+ ./gradlew publishMavenJavaPublicationToLocalRepository
|
|
|
|
+ ./gradlew cloneRepository -PrepositoryName="spring-projects/spring-security-samples" -Pref="$samples_branch" -PcloneOutputDirectory="$SAMPLES_DIR"
|
|
|
|
+ ./gradlew --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$version" :runAllTests
|
|
check-tangles:
|
|
check-tangles:
|
|
name: Check for Package Tangles
|
|
name: Check for Package Tangles
|
|
runs-on: ubuntu-latest
|
|
runs-on: ubuntu-latest
|
|
@@ -82,21 +82,21 @@ jobs:
|
|
./gradlew check s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
|
|
./gradlew check s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
|
|
deploy-artifacts:
|
|
deploy-artifacts:
|
|
name: Deploy Artifacts
|
|
name: Deploy Artifacts
|
|
- needs: [ build, test, check-tangles ]
|
|
|
|
|
|
+ needs: [ build, test, check-samples, check-tangles ]
|
|
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
|
|
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
|
|
with:
|
|
with:
|
|
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
|
|
should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
|
|
secrets: inherit
|
|
secrets: inherit
|
|
deploy-docs:
|
|
deploy-docs:
|
|
name: Deploy Docs
|
|
name: Deploy Docs
|
|
- needs: [ build, test, check-tangles ]
|
|
|
|
|
|
+ needs: [ build, test, check-samples, check-tangles ]
|
|
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
|
|
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
|
|
with:
|
|
with:
|
|
should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }}
|
|
should-deploy-docs: ${{ needs.build.outputs.should-deploy-artifacts }}
|
|
secrets: inherit
|
|
secrets: inherit
|
|
deploy-schema:
|
|
deploy-schema:
|
|
name: Deploy Schema
|
|
name: Deploy Schema
|
|
- needs: [ build, test, check-tangles ]
|
|
|
|
|
|
+ needs: [ build, test, check-samples, check-tangles ]
|
|
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-schema.yml@v1
|
|
uses: spring-io/spring-security-release-tools/.github/workflows/deploy-schema.yml@v1
|
|
with:
|
|
with:
|
|
should-deploy-schema: ${{ needs.build.outputs.should-deploy-artifacts }}
|
|
should-deploy-schema: ${{ needs.build.outputs.should-deploy-artifacts }}
|