@@ -41,29 +41,29 @@ jobs:
41
41
java-version : ${{ matrix.java-version }}
42
42
test-args : --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=6.2.+ -PreactorVersion=2023.0.+ -PspringDataVersion=2024.0.+ --stacktrace
43
43
secrets : inherit
44
- # check-samples:
45
- # name: Check Samples
46
- # runs-on: ubuntu-latest
47
- # if: ${{ github.repository_owner == 'spring-projects' }}
48
- # steps:
49
- # - uses: actions/checkout@v4
50
- # - name: Set up gradle
51
- # uses: spring-io/spring-gradle-build-action@v2
52
- # with:
53
- # java-version: 17
54
- # distribution: temurin
55
- # - name: Check samples project
56
- # env:
57
- # LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos
58
- # SAMPLES_DIR: ../spring-security-samples
59
- # run: |
60
- # # Extract version from gradle.properties
61
- # version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
62
- # # Extract samplesBranch from gradle.properties
63
- # samples_branch=$(cat gradle.properties | grep "samplesBranch=" | awk -F'=' '{print $2}')
64
- # ./gradlew publishMavenJavaPublicationToLocalRepository
65
- # ./gradlew cloneRepository -PrepositoryName="spring-projects/spring-security-samples" -Pref="$samples_branch" -PcloneOutputDirectory="$SAMPLES_DIR"
66
- # ./gradlew --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$version" :runAllTests
44
+ check-samples :
45
+ name : Check Samples
46
+ runs-on : ubuntu-latest
47
+ if : ${{ github.repository_owner == 'spring-projects' }}
48
+ steps :
49
+ - uses : actions/checkout@v4
50
+ - name : Set up gradle
51
+ uses : spring-io/spring-gradle-build-action@v2
52
+ with :
53
+ java-version : 17
54
+ distribution : temurin
55
+ - name : Check samples project
56
+ env :
57
+ LOCAL_REPOSITORY_PATH : ${{ github.workspace }}/build/publications/repos
58
+ SAMPLES_DIR : ../spring-security-samples
59
+ run : |
60
+ # Extract version from gradle.properties
61
+ version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}')
62
+ # Extract samplesBranch from gradle.properties
63
+ samples_branch=$(cat gradle.properties | grep "samplesBranch=" | awk -F'=' '{print $2}')
64
+ ./gradlew publishMavenJavaPublicationToLocalRepository
65
+ ./gradlew cloneRepository -PrepositoryName="spring-projects/spring-security-samples" -Pref="$samples_branch" -PcloneOutputDirectory="$SAMPLES_DIR"
66
+ ./gradlew --project-dir "$SAMPLES_DIR" --init-script spring-security-ci.gradle -PlocalRepositoryPath="$LOCAL_REPOSITORY_PATH" -PspringSecurityVersion="$version" :runAllTests
67
67
check-tangles :
68
68
name : Check for Package Tangles
69
69
runs-on : ubuntu-latest
@@ -82,21 +82,21 @@ jobs:
82
82
./gradlew check s101 -Ps101.licenseId="$STRUCTURE101_LICENSEID" --stacktrace
83
83
deploy-artifacts :
84
84
name : Deploy Artifacts
85
- needs : [ build, test, check-tangles ]
85
+ needs : [ build, test, check-samples, check- tangles ]
86
86
uses : spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
87
87
with :
88
88
should-deploy-artifacts : ${{ needs.build.outputs.should-deploy-artifacts }}
89
89
secrets : inherit
90
90
deploy-docs :
91
91
name : Deploy Docs
92
- needs : [ build, test, check-tangles ]
92
+ needs : [ build, test, check-samples, check- tangles ]
93
93
uses : spring-io/spring-security-release-tools/.github/workflows/deploy-docs.yml@v1
94
94
with :
95
95
should-deploy-docs : ${{ needs.build.outputs.should-deploy-artifacts }}
96
96
secrets : inherit
97
97
deploy-schema :
98
98
name : Deploy Schema
99
- needs : [ build, test, check-tangles ]
99
+ needs : [ build, test, check-samples, check- tangles ]
100
100
uses : spring-io/spring-security-release-tools/.github/workflows/deploy-schema.yml@v1
101
101
with :
102
102
should-deploy-schema : ${{ needs.build.outputs.should-deploy-artifacts }}
0 commit comments