Remove support for offline mode

gradle · May 3, 2024 · 77b69fc · 77b69fc
1 parent 031b900
commit 77b69fc
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 370 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ group = "com.gradle"
 repositories {
     maven {
         name = "Solutions"
-        url = uri("https://repo.gradle.org/artifactory/solutions")
+        url = uri("https://repo.grdev.net/artifactory/solutions")
         credentials {
             username = providers
                 .environmentVariable("GRADLE_SOLUTIONS_REPOSITORY_USERNAME")

diff --git a/components/scripts/gradle/01-validate-incremental-building.sh b/components/scripts/gradle/01-validate-incremental-building.sh
@@ -71,16 +71,11 @@ execute() {
 wizard_execute() {
   print_introduction
 
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    print_bl
-    explain_prerequisites_ccud_gradle_plugin "I."
+  print_bl
+  explain_prerequisites_ccud_gradle_plugin "I."
 
-    print_bl
-    explain_prerequisites_api_access "II."
-  else
-    print_bl
-    explain_prerequisites_ccud_gradle_plugin
-  fi
+  print_bl
+  explain_prerequisites_api_access "II."
 
   print_bl
   explain_collect_git_details
@@ -141,19 +136,11 @@ execute_build() {
 }
 
 print_gradle_command() {
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
     info "./gradlew --no-build-cache -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} $*$(print_extra_args)"
-  else
-    info "./gradlew --no-build-cache -Dscan.dump -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} $*$(print_extra_args)"
-  fi
 }
 
 fetch_build_cache_metrics() {
-  if [ "$build_scan_publishing_mode" == "on" ]; then
-    process_build_scan_data_online
-  else
-    find_and_read_build_scan_dumps
-  fi
+  process_build_scan_data_online
 }
 
 # Overrides summary.sh#print_performance_characteristics
@@ -271,8 +258,7 @@ EOF
 
 explain_measure_build_results() {
   local text
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    IFS='' read -r -d '' text <<EOF
+  IFS='' read -r -d '' text <<EOF
 $(print_separator)
 ${HEADER_COLOR}Measure build results${RESTORE}
 
@@ -285,30 +271,13 @@ the two builds to assist you in your investigation.
 
 ${USER_ACTION_COLOR}Press <Enter> to measure the build results.${RESTORE}
 EOF
-  else
-    IFS='' read -r -d '' text <<EOF
-$(print_separator)
-${HEADER_COLOR}Measure build results${RESTORE}
-
-Now that the second build has finished successfully, you are ready to measure
-how well your build leverages Gradle’s incremental build functionality for the
-invoked set of Gradle tasks.
-
-Some of the build scan data will be extracted from the locally stored,
-intermediate build data produced by the two builds to assist you in your
-investigation.
-
-${USER_ACTION_COLOR}Press <Enter> to measure the build results.${RESTORE}
-EOF
-  fi
   print_interactive_text "${text}"
   wait_for_enter
 }
 
 explain_and_print_summary() {
   local text
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    IFS='' read -r -d '' text <<EOF
+  IFS='' read -r -d '' text <<EOF
 The ‘Summary’ section below captures the configuration of the experiment and
 the two build scans that were published as part of running the experiment. The
 build scan of the second build is particularly interesting since this is where
@@ -331,23 +300,6 @@ $(print_command_to_repeat_experiment)
 
 $(explain_when_to_rerun_experiment)
 EOF
-  else
-    IFS='' read -r -d '' text <<EOF
-The ‘Summary’ section below captures the configuration of the experiment. No
-build scans are available for inspection since publishing was disabled for the
-experiment.
-
-$(explain_performance_characteristics)
-
-$(explain_command_to_repeat_experiment)
-
-$(print_summary)
-
-$(print_command_to_repeat_experiment)
-
-$(explain_when_to_rerun_experiment)
-EOF
-  fi
   print_interactive_text "${text}"
 }
 

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
@@ -72,16 +72,11 @@ execute() {
 wizard_execute() {
   print_introduction
 
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    print_bl
-    explain_prerequisites_ccud_gradle_plugin "I."
+  print_bl
+  explain_prerequisites_ccud_gradle_plugin "I."
 
-    print_bl
-    explain_prerequisites_api_access "II."
-  else
-    print_bl
-    explain_prerequisites_ccud_gradle_plugin
-  fi
+  print_bl
+  explain_prerequisites_api_access "II."
 
   print_bl
   explain_collect_git_details
@@ -146,19 +141,11 @@ execute_build() {
 }
 
 print_gradle_command() {
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    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
+  info "./gradlew --build-cache -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
 }
 
 fetch_build_cache_metrics() {
-  if [ "$build_scan_publishing_mode" == "on" ]; then
-    process_build_scan_data_online
-  else
-    find_and_read_build_scan_dumps
-  fi
+  process_build_scan_data_online
 }
 
 print_introduction() {
@@ -249,8 +236,7 @@ EOF
 
 explain_measure_build_results() {
   local text
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    IFS='' read -r -d '' text <<EOF
+  IFS='' read -r -d '' text <<EOF
 $(print_separator)
 ${HEADER_COLOR}Measure build results${RESTORE}
 
@@ -263,29 +249,13 @@ two builds to assist you in your investigation.
 
 ${USER_ACTION_COLOR}Press <Enter> to measure the build results.${RESTORE}
 EOF
-  else
-    IFS='' read -r -d '' text <<EOF
-$(print_separator)
-${HEADER_COLOR}Measure build results${RESTORE}
-
-Now that the second build has finished successfully, you are ready to measure how
-well your build leverages Gradle’s local build caching functionality for the
-invoked set of Gradle tasks.
-
-Some of the build scan data will be extracted from the locally stored, intermediate
-build data produced by the two builds to assist you in your investigation.
-
-${USER_ACTION_COLOR}Press <Enter> to measure the build results.${RESTORE}
-EOF
-  fi
   print_interactive_text "${text}"
   wait_for_enter
 }
 
 explain_and_print_summary() {
   local text
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    IFS='' read -r -d '' text <<EOF
+  IFS='' read -r -d '' text <<EOF
 The ‘Summary’ section below captures the configuration of the experiment and the
 two build scans that were published as part of running the experiment. The build
 scan of the second build is particularly interesting since this is where you can
@@ -307,23 +277,6 @@ $(print_command_to_repeat_experiment)
 
 $(explain_when_to_rerun_experiment)
 EOF
-  else
-    IFS='' read -r -d '' text <<EOF
-The ‘Summary’ section below captures the configuration of the experiment. No
-build scans are available for inspection since publishing was disabled for the
-experiment.
-
-$(explain_performance_characteristics)
-
-$(explain_command_to_repeat_experiment)
-
-$(print_summary)
-
-$(print_command_to_repeat_experiment)
-
-$(explain_when_to_rerun_experiment)
-EOF
-  fi
   print_interactive_text "${text}"
 }
 

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
@@ -73,16 +73,11 @@ execute() {
 wizard_execute() {
   print_introduction
 
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    print_bl
-    explain_prerequisites_ccud_gradle_plugin "I."
+  print_bl
+  explain_prerequisites_ccud_gradle_plugin "I."
 
-    print_bl
-    explain_prerequisites_api_access "II."
-  else
-    print_bl
-    explain_prerequisites_ccud_gradle_plugin
-  fi
+  print_bl
+  explain_prerequisites_api_access "II."
 
   print_bl
   explain_collect_git_details
@@ -151,19 +146,11 @@ execute_build() {
 }
 
 print_gradle_command() {
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    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
+  info "./gradlew --build-cache -Dscan.tag.${EXP_SCAN_TAG} -Dscan.value.runId=${RUN_ID} clean ${tasks}$(print_extra_args)"
 }
 
 fetch_build_cache_metrics() {
-  if [ "$build_scan_publishing_mode" == "on" ]; then
-    process_build_scan_data_online
-  else
-    find_and_read_build_scan_dumps
-  fi
+  process_build_scan_data_online
 }
 
 print_introduction() {
@@ -286,8 +273,7 @@ EOF
 
 explain_measure_build_results() {
   local text
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    IFS='' read -r -d '' text <<EOF
+  IFS='' read -r -d '' text <<EOF
 $(print_separator)
 ${HEADER_COLOR}Measure build results${RESTORE}
 
@@ -300,30 +286,13 @@ two builds to assist you in your investigation.
 
 ${USER_ACTION_COLOR}Press <Enter> to measure the build results.${RESTORE}
 EOF
-  else
-    IFS='' read -r -d '' text <<EOF
-$(print_separator)
-${HEADER_COLOR}Measure build results${RESTORE}
-
-Now that the second build has finished successfully, you are ready to measure how
-well your build leverages Gradle’s local build caching functionality for the
-invoked set of Gradle tasks.
-
-Some of the build scan data will be extracted from the locally stored, intermediate
-build data produced by the two builds to assist you in your investigation.
-
-${USER_ACTION_COLOR}Press <Enter> to measure the build results.${RESTORE}
-EOF
-  fi
   print_interactive_text "${text}"
   wait_for_enter
 }
 
 explain_and_print_summary() {
   local text
-
-  if [[ "${build_scan_publishing_mode}" == "on" ]]; then
-    IFS='' read -r -d '' text <<EOF
+  IFS='' read -r -d '' text <<EOF
 The ‘Summary’ section below captures the configuration of the experiment and the
 two build scans that were published as part of running the experiment. The build
 scan of the second build is particularly interesting since this is where you can
@@ -345,23 +314,6 @@ $(print_command_to_repeat_experiment)
 
 $(explain_when_to_rerun_experiment)
 EOF
-  else
-    IFS='' read -r -d '' text <<EOF
-The ‘Summary’ section below captures the configuration of the experiment. No
-build scans are available for inspection since publishing was disabled for the
-experiment.
-
-$(explain_performance_characteristics)
-
-$(explain_command_to_repeat_experiment)
-
-$(print_summary)
-
-$(print_command_to_repeat_experiment)
-
-$(explain_when_to_rerun_experiment)
-EOF
-  fi
   print_interactive_text "${text}"
 }
 

diff --git a/components/scripts/lib/build-scan-offline.sh b/components/scripts/lib/build-scan-offline.sh