No longer include --scan when displaying the build command

meslubi2021 · Mar 9, 2023 · 2a6a10f · 2a6a10f
1 parent d61c89e
commit 2a6a10f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/components/scripts/gradle/01-validate-incremental-building.sh b/components/scripts/gradle/01-validate-incremental-building.sh
@@ -149,12 +149,10 @@ execute_build() {
 
 print_gradle_command() {
   local scan_arg
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    scan_arg="--scan"
-  else
-    scan_arg="-Dscan.dump"
+  if [[ "${build_scan_publishing_mode}" != "on" ]]; then
+    scan_arg=" -Dscan.dump"
   fi
-  info "./gradlew --no-build-cache ${scan_arg} -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} $*$(print_extra_args)"
+  info "./gradlew --no-build-cache${scan_arg} -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} $*$(print_extra_args)"
 }
 
 fetch_build_cache_metrics() {

diff --git a/components/scripts/gradle/02-validate-local-build-caching-same-location.sh b/components/scripts/gradle/02-validate-local-build-caching-same-location.sh
@@ -154,7 +154,7 @@ execute_build() {
 
 print_gradle_command() {
   if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    info "./gradlew --build-cache --scan -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
+    info "./gradlew --build-cache -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
   else
     info "./gradlew --build-cache -Dscan.dump -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
   fi

diff --git a/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh b/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh
@@ -159,7 +159,7 @@ execute_build() {
 
 print_gradle_command() {
   if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    info "./gradlew --build-cache --scan -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
+    info "./gradlew --build-cache -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
   else
     info "./gradlew --build-cache -Dscan.dump -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
   fi

diff --git a/components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh b/components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh
@@ -204,7 +204,7 @@ execute_build() {
   args+=(clean ${tasks})
 
   info "Running build:"
-  info "./gradlew --build-cache --scan -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
+  info "./gradlew --build-cache -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
 
   invoke_gradle 1 "${args[@]}"
 }