From 69a00413282bcb632ac661a630d0df71b8ed08ab Mon Sep 17 00:00:00 2001
From: Ikhun Um <ikhun.um@linecorp.com>
Date: Wed, 23 Aug 2023 19:39:52 +0900
Subject: [PATCH] Ignore empty Gradle build scans and continue to upload
 (#5130)

Motivation:

A build scan may fail to upload if a Gradle build is corrupted somehow.
If there is no scan data in `.gradle/build-scan-data`, `./gradlew buildScanPublishPrevious` exits with 1, and then the subsequent commands will be halted.

Modifications:

- Ignore failed upload build scan and continue to upload the next data
- Use html_url for the workflow job
---
 .github/actions/comment-build-scan.ts   |  4 ++--
 .github/workflows/gradle-build-scan.yml | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/actions/comment-build-scan.ts b/.github/actions/comment-build-scan.ts
index 0085f44bfee..45d90ad98c8 100644
--- a/.github/actions/comment-build-scan.ts
+++ b/.github/actions/comment-build-scan.ts
@@ -42,9 +42,9 @@ async function main(): Promise<void> {
     const [jobName, scanUrl]= scan.split(" ");
     const job = jobs.find(job => job.name === jobName);
     if (job.conclusion === 'success') {
-      commentBody += `| [${job.name}](${job.url}) | ✅ | ${scanUrl} |\n`;
+      commentBody += `| [${job.name}](${job.html_url}) | ✅ | ${scanUrl} |\n`;
     } else {
-      commentBody += `| [${job.name}](${job.url}) | ❌ (${job.conclusion}) | ${scanUrl} |\n`;
+      commentBody += `| [${job.name}](${job.html_url}) | ❌ (${job.conclusion}) | ${scanUrl} |\n`;
     }
   }
 
diff --git a/.github/workflows/gradle-build-scan.yml b/.github/workflows/gradle-build-scan.yml
index ffff259a323..471e450ed8f 100644
--- a/.github/workflows/gradle-build-scan.yml
+++ b/.github/workflows/gradle-build-scan.yml
@@ -66,6 +66,7 @@ jobs:
           echo "## Build Scan®" >> "$GITHUB_STEP_SUMMARY"
           echo "" >> "$GITHUB_STEP_SUMMARY"
 
+          rm -rf $BUILD_SCAN_DIR
           for SCAN in $(ls $DOWNLOAD_DIR) ; do
             mkdir -p $BUILD_SCAN_DIR
             echo "🚚 Copying build scan: ${DOWNLOAD_DIR}${SCAN}/ to $BUILD_SCAN_DIR ..."
@@ -73,11 +74,14 @@ jobs:
 
             JOB_NAME=$(echo ${SCAN} | sed 's/.*build-scan-\(.*\)/\1/')
             echo "📤 Uploading build scan for job ${JOB_NAME} ..."
-            ./gradlew --no-daemon --stacktrace clean buildScanPublishPrevious
-            echo "✅ Published build scan: ${JOB_NAME}"
-
-            BUILD_SCANS="${JOB_NAME} $(cat build/build-scan-url.txt),${BUILD_SCANS}"
-            echo "- [${JOB_NAME}]($(cat build/build-scan-url.txt))" >> "$GITHUB_STEP_SUMMARY"
+          
+            if ./gradlew --no-daemon --stacktrace clean buildScanPublishPrevious; then
+              echo "✅ Published build scan: ${JOB_NAME}"
+              BUILD_SCANS="${JOB_NAME} $(cat build/build-scan-url.txt),${BUILD_SCANS}"
+              echo "- [${JOB_NAME}]($(cat build/build-scan-url.txt))" >> "$GITHUB_STEP_SUMMARY"
+            else
+              echo "❌ Failed to upload build scan: ${JOB_NAME}"
+            fi
 
             rm -rf $BUILD_SCAN_DIR
           done