From ccf0d6205f2e35a92430f796b4a0cf6841608569 Mon Sep 17 00:00:00 2001
From: Powei Feng <powei@google.com>
Date: Thu, 4 Dec 2025 10:40:05 -0800
Subject: [PATCH] Fix a couple of CI errors (#9477)

 - Make sure that renderdiff fails when either building or
   rendering fails (the previous problem was in the use of &&
   that masked the non-zero exit).
 - Make sure that golden branch is properly parsed in
   postsubmit.yml
 - Disable vk loader debug by default
---
 .github/workflows/postsubmit.yml |  3 ++-
 .github/workflows/presubmit.yml  | 12 ++++++------
 test/renderdiff/src/render.py    |  3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/postsubmit.yml b/.github/workflows/postsubmit.yml
index e3e4c36d89..f867391c55 100644
--- a/.github/workflows/postsubmit.yml
+++ b/.github/workflows/postsubmit.yml
@@ -21,8 +21,9 @@ jobs:
       - name: Run update script
         env:
           GH_TOKEN: ${{ secrets.FILAMENTBOT_TOKEN }}
+          COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }}
         run: |
-          GOLDEN_BRANCH=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | python3 test/renderdiff/src/commit_msg.py)
+          GOLDEN_BRANCH=$(echo "${COMMIT_MESSAGE}" | python3 test/renderdiff/src/commit_msg.py)
           COMMIT_HASH="${{ steps.get_commit_msg.outputs.hash }}"
           if [[ "${GOLDEN_BRANCH}" != "main" ]]; then
               git config --global user.email "filament.bot@gmail.com"
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index c619d664c3..272c9af65a 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -134,18 +134,17 @@ jobs:
         env:
           COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }}
         run: |
-          ls ./gltf/Models
           TEST_DIR=test/renderdiff
           source ${TEST_DIR}/src/preamble.sh
-          start_
+          set -eux
           GOLDEN_BRANCH=$(echo "${COMMIT_MESSAGE}" | python3 ${TEST_DIR}/src/commit_msg.py)
-          bash ${TEST_DIR}/generate.sh && \
-              python3 ${TEST_DIR}/src/golden_manager.py \
+          bash ${TEST_DIR}/generate.sh
+          python3 ${TEST_DIR}/src/golden_manager.py \
                   --branch=${GOLDEN_BRANCH} \
                   --output=${GOLDEN_OUTPUT_DIR}
 
-          # Note that we need to upload the output even if comparison fails, so we undo `set -ex`
-          end_
+          # Note that we need to upload the output even if comparison fails, so we undo `set -eux`
+          set +eux
 
           python3 ${TEST_DIR}/src/compare.py \
               --src=${GOLDEN_OUTPUT_DIR} \
@@ -158,6 +157,7 @@ jobs:
              cat compare_output.txt >> "$GITHUB_OUTPUT"
              echo "$DELIMITER" >> "$GITHUB_OUTPUT"
           fi
+        shell: bash
       - uses: actions/upload-artifact@v4
         with:
           name: presubmit-renderdiff-result
diff --git a/test/renderdiff/src/render.py b/test/renderdiff/src/render.py
index 9dae9b8746..935eea8286 100644
--- a/test/renderdiff/src/render.py
+++ b/test/renderdiff/src/render.py
@@ -42,7 +42,8 @@ def _render_single_model(gltf_viewer, test_json_path, named_output_dir,
     env |= {
       'VK_ICD_FILENAMES': vk_icd,
       'VK_DRIVER_FILES': vk_icd,
-      'VK_LOADER_DEBUG': 'all',
+      # Uncomment when there's a problem finding the vk driver
+      # 'VK_LOADER_DEBUG': 'all',
     }
 
   out_name = f'{test_name}.{backend}.{model}'