From 5d776f2a8b69bb1db24efaf1f27b6ac44f1d3039 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sat, 25 Jul 2020 10:33:39 +0100 Subject: [PATCH] Set user.name in CI builds so it's picked up by Gradle Enterprise --- ci/scripts/build-deployment-tests.sh | 2 +- ci/scripts/build-integration-tests.sh | 2 +- ci/scripts/build-project-windows.bat | 2 +- ci/scripts/build-project.sh | 2 +- ci/scripts/build-samples.sh | 2 +- ci/scripts/stage.sh | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/scripts/build-deployment-tests.sh b/ci/scripts/build-deployment-tests.sh index c93fd09008..9ba408193c 100755 --- a/ci/scripts/build-deployment-tests.sh +++ b/ci/scripts/build-deployment-tests.sh @@ -5,5 +5,5 @@ source $(dirname $0)/common.sh repository=$(pwd)/distribution-repository pushd git-repo > /dev/null -run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} +run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Duser.name=concourse popd > /dev/null diff --git a/ci/scripts/build-integration-tests.sh b/ci/scripts/build-integration-tests.sh index bc5876449f..b532f6f2ec 100755 --- a/ci/scripts/build-integration-tests.sh +++ b/ci/scripts/build-integration-tests.sh @@ -5,5 +5,5 @@ source $(dirname $0)/common.sh repository=$(pwd)/distribution-repository pushd git-repo > /dev/null -run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -Dfull -Drepository=file://${repository} +run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -Dfull -Drepository=file://${repository} -Duser.name=concourse popd > /dev/null diff --git a/ci/scripts/build-project-windows.bat b/ci/scripts/build-project-windows.bat index efade5d1ac..a3b460cf2c 100755 --- a/ci/scripts/build-project-windows.bat +++ b/ci/scripts/build-project-windows.bat @@ -3,4 +3,4 @@ SET PATH=%PATH%;C:\Program Files\Git\usr\bin cd git-repo echo ".\mvnw clean install" > build.log -.\mvnw clean install -U >> build.log 2>&1 || (sleep 1 && tail -n 3000 build.log && exit 1) \ No newline at end of file +.\mvnw clean install -U -Duser.name=concourse >> build.log 2>&1 || (sleep 1 && tail -n 3000 build.log && exit 1) \ No newline at end of file diff --git a/ci/scripts/build-project.sh b/ci/scripts/build-project.sh index af694d0057..db97363be1 100755 --- a/ci/scripts/build-project.sh +++ b/ci/scripts/build-project.sh @@ -6,5 +6,5 @@ repository=$(pwd)/distribution-repository pushd git-repo > /dev/null run_maven -N clean verify -Dscan=false -run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} +run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} -Duser.name=concourse popd > /dev/null diff --git a/ci/scripts/build-samples.sh b/ci/scripts/build-samples.sh index bf27164251..bb92ac027e 100755 --- a/ci/scripts/build-samples.sh +++ b/ci/scripts/build-samples.sh @@ -5,5 +5,5 @@ source $(dirname $0)/common.sh repository=$(pwd)/distribution-repository pushd git-repo > /dev/null -run_maven -f spring-boot-samples/pom.xml clean install -U -Dfull -Drepository=file://${repository} +run_maven -f spring-boot-samples/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Duser.name=concourse popd > /dev/null diff --git a/ci/scripts/stage.sh b/ci/scripts/stage.sh index 59c24e6a2e..f4f666ede2 100755 --- a/ci/scripts/stage.sh +++ b/ci/scripts/stage.sh @@ -35,10 +35,10 @@ git add pom.xml > /dev/null git commit -m"Release v$stageVersion" > /dev/null git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null -run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -run_maven -f spring-boot-samples/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false +run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -Duser.name=concourse +run_maven -f spring-boot-samples/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -Duser.name=concourse +run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -Duser.name=concourse +run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -Duser.name=concourse git reset --hard HEAD^ > /dev/null if [[ $nextVersion != $snapshotVersion ]]; then