From 0f241944180c071540a3f1215f818ffeb27c60dc Mon Sep 17 00:00:00 2001 From: Marcus Hert Da Coregio Date: Fri, 10 Nov 2023 11:16:40 -0300 Subject: [PATCH] Rename cloneSamples to cloneRepository Closes gh-14127 --- .github/workflows/continuous-integration-workflow.yml | 5 ++++- build.gradle | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 1255f25028..91e80942b6 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -40,6 +40,8 @@ jobs: # Extract version from gradle.properties version=$(cat gradle.properties | grep "version=" | awk -F'=' '{print $2}') echo "project_version=$version" >>$GITHUB_OUTPUT + samples_branch=$(cat gradle.properties | grep "samplesBranch=" | awk -F'=' '{print $2}') + echo "samples_branch=$samples_branch" >>$GITHUB_OUTPUT build_jdk_17: name: Build JDK 17 needs: [prerequisites] @@ -101,12 +103,13 @@ jobs: LOCAL_REPOSITORY_PATH: ${{ github.workspace }}/build/publications/repos SAMPLES_DIR: ../spring-security-samples VERSION: ${{ needs.prerequisites.outputs.project_version }} + SAMPLES_BRANCH: ${{ needs.prerequisites.outputs.samples_branch }} run: | export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER" export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" ./gradlew publishMavenJavaPublicationToLocalRepository - ./gradlew cloneSamples -PcloneOutputDirectory="$SAMPLES_DIR" + ./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: name: Check for Package Tangles diff --git a/build.gradle b/build.gradle index e33d9bb35e..434b358ab8 100644 --- a/build.gradle +++ b/build.gradle @@ -143,10 +143,11 @@ nohttp { source.builtBy(project(':spring-security-config').tasks.withType(RncToXsd)) } -tasks.register('cloneSamples', IncludeRepoTask) { - repository = 'spring-projects/spring-security-samples' - ref = samplesBranch - outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : project.file("build/samples") +tasks.register('cloneRepository', IncludeRepoTask) { + repository = project.getProperties().get("repositoryName") + ref = project.getProperties().get("ref") + var defaultDirectory = project.file("build/tmp/clone") + outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : defaultDirectory } s101 {