Skip to content

Commit ee1166b

Browse files
committed
Align internal env var name with the build-scan-summary jar filename
1 parent 0ac12da commit ee1166b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: components/scripts/lib/build-scan-offline.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
readonly READ_BUILD_SCAN_DATA_JAR="${LIB_DIR}/build-scan-clients/build-scan-summary-${SUMMARY_VERSION}.jar"
3+
readonly BUILD_SCAN_SUMMARY_JAR="${SCRIPT_DIR}/lib/develocity/build-scan-summary-${SUMMARY_VERSION}.jar"
44

55
# Build scan summary exit codes
66
readonly SUCCESS=0
@@ -40,7 +40,7 @@ read_build_scan_dumps() {
4040
)
4141

4242
echo "Extracting Build Scan data for all builds"
43-
build_scan_data="$(JAVA_HOME="${CLIENT_JAVA_HOME:-$JAVA_HOME}" invoke_java "$READ_BUILD_SCAN_DATA_JAR" "${args[@]}")"
43+
build_scan_data="$(JAVA_HOME="${CLIENT_JAVA_HOME:-$JAVA_HOME}" invoke_java "$BUILD_SCAN_SUMMARY_JAR" "${args[@]}")"
4444
build_scan_summary_exit_code="$?"
4545
if [[ $build_scan_summary_exit_code -eq $JVM_VERSION_NOT_SUPPORTED ]]; then
4646
die "ERROR: Java 17+ is required when using --disable-build-scan-publishing. Rerun the script with Java 17+ or set the CLIENT_JAVA_HOME environment variable to a Java 17+ installation." "$UNEXPECTED_ERROR"

Diff for: components/scripts/lib/build-scan-online.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
readonly FETCH_BUILD_SCAN_DATA_JAR="${SCRIPT_DIR}/lib/develocity/build-scan-summary-${SUMMARY_VERSION}.jar"
3+
readonly BUILD_SCAN_SUMMARY_JAR="${SCRIPT_DIR}/lib/develocity/build-scan-summary-${SUMMARY_VERSION}.jar"
44

55
# This is a helper function for the common pattern of reading Build Scan metadata
66
# from the build-scans.csv file, then retrieving build metrics using the Gradle
@@ -101,5 +101,5 @@ fetch_build_scan_data() {
101101
args+=( "${run_num},${build_scan_urls[run_num]}" )
102102
done
103103

104-
JAVA_HOME="${CLIENT_JAVA_HOME:-$JAVA_HOME}" invoke_java "${FETCH_BUILD_SCAN_DATA_JAR}" "${args[@]}"
104+
JAVA_HOME="${CLIENT_JAVA_HOME:-$JAVA_HOME}" invoke_java "${BUILD_SCAN_SUMMARY_JAR}" "${args[@]}"
105105
}

0 commit comments

Comments
 (0)