ci: fix git checkout after baseline generation and improve error handling

cvanelteren · cvanelteren · commit fad2f5dc25bc · 2026-02-02T05:53:37.000+10:00
diff --git a/.github/workflows/build-ultraplot.yml b/.github/workflows/build-ultraplot.yml
@@ -166,7 +166,6 @@ jobs:
             echo "FILTERED_NODEIDS_BASE=${FILTERED_NODEIDS}"
             if [ -z "${FILTERED_NODEIDS}" ]; then
               echo "No valid nodeids found on base; skipping baseline generation."
-              exit 0
             else
               echo "=== Memory before baseline generation ===" && free -h
               pytest -n ${PYTEST_WORKERS} --dist loadfile --tb=short --disable-warnings -W ignore \
@@ -179,19 +178,27 @@ jobs:
                 status=0
               fi
             fi
-            exit "$status"
+            # Return to the PR branch before continuing
+            if [ -n "${{ github.event.pull_request.base.sha }}" ]; then
+              echo "Checking out PR branch: ${{ github.sha }}"
+              git checkout ${{ github.sha }} || echo "Warning: git checkout failed, but continuing"
+            fi
+            if [ "$status" -ne 0 ]; then
+              echo "Baseline generation failed with status $status"
+              exit "$status"
+            fi
           else
             echo "=== Memory before baseline generation ===" && free -h
             pytest -n ${PYTEST_WORKERS} --dist loadfile --tb=short --disable-warnings -W ignore \
               --mpl-generate-path=./ultraplot/tests/baseline/ \
               --mpl-default-style="./ultraplot.yml" \
               ultraplot/tests
             echo "=== Memory after baseline generation ===" && free -h
-          fi
-
-          # Return to the PR branch for the rest of the job
-          if [ -n "${{ github.event.pull_request.base.sha }}" ]; then
-            git checkout ${{ github.sha }}
+            # Return to the PR branch for the rest of the job
+            if [ -n "${{ github.event.pull_request.base.sha }}" ]; then
+              echo "Checking out PR branch: ${{ github.sha }}"
+              git checkout ${{ github.sha }} || echo "Warning: git checkout failed, but continuing"
+            fi
           fi
 
       # Image Comparison (Uses cached or newly generated baseline)
