Enhance ddb-publish action to search multiple workflows for successful runs and improve error handling

Author: m-houston

actions/ddb-publish/action.yml

@@ -68,30 +68,48 @@ runs:
         branch="${ACTION_REF#refs/heads/}"
         echo "[ddb-publish] No release found for ref '${ACTION_REF}'. Falling back to latest workflow artifact on branch '${branch}' from '${ACTION_REPO}'."
 
-        set +e
-        run_id="$(gh run list \
-          --repo "${ACTION_REPO}" \
-          --workflow "stage-3-build.yaml" \
-          --branch "${branch}" \
-          --status success \
-          --json databaseId \
-          --jq '.[0].databaseId' 2>/tmp/ddb_publish_run_list_err.log)"
-        rc=$?
-        set -e
-
-        if [[ $rc -ne 0 ]]; then
-          echo "ERROR: Failed to query workflow runs from '${ACTION_REPO}'." >&2
-          cat /tmp/ddb_publish_run_list_err.log >&2 || true
-          echo "HINT: ensure the token has read access to '${ACTION_REPO}' and workflow permissions allow actions read." >&2
-          exit 1
-        fi
+        run_id=""
+        workflow_used=""
+
+        for workflow_file in "stage-3-build.yaml" "cicd-1-pull-request.yaml"; do
+          echo "[ddb-publish] Looking for successful runs in workflow '${workflow_file}'."
+
+          set +e
+          run_id_candidate="$(gh run list \
+            --repo "${ACTION_REPO}" \
+            --workflow "${workflow_file}" \
+            --branch "${branch}" \
+            --status success \
+            --json databaseId \
+            --jq '.[0].databaseId' 2>/tmp/ddb_publish_run_list_err.log)"
+          rc=$?
+          set -e
+
+          if [[ $rc -ne 0 ]]; then
+            if grep -q "HTTP 404" /tmp/ddb_publish_run_list_err.log; then
+              echo "[ddb-publish] Workflow '${workflow_file}' not found on default branch; trying next workflow candidate."
+              continue
+            fi
+
+            echo "ERROR: Failed to query workflow runs from '${ACTION_REPO}' for workflow '${workflow_file}'." >&2
+            cat /tmp/ddb_publish_run_list_err.log >&2 || true
+            echo "HINT: ensure the token has read access to '${ACTION_REPO}' and workflow permissions allow actions read." >&2
+            exit 1
+          fi
+
+          if [[ -n "${run_id_candidate}" && "${run_id_candidate}" != "null" ]]; then
+            run_id="${run_id_candidate}"
+            workflow_used="${workflow_file}"
+            break
+          fi
+        done
 
         if [[ -z "${run_id}" || "${run_id}" == "null" ]]; then
-          echo "ERROR: Could not find a successful 'stage-3-build.yaml' run for branch '${branch}' in '${ACTION_REPO}' to download artifact '${WORKFLOW_ARTIFACT_NAME}'." >&2
+          echo "ERROR: Could not find a successful run on branch '${branch}' in '${ACTION_REPO}' containing artifact '${WORKFLOW_ARTIFACT_NAME}'. Checked workflows: stage-3-build.yaml, cicd-1-pull-request.yaml." >&2
           exit 1
         fi
 
-        echo "[ddb-publish] Downloading artifact '${WORKFLOW_ARTIFACT_NAME}' from workflow run ${run_id} in '${ACTION_REPO}'."
+        echo "[ddb-publish] Downloading artifact '${WORKFLOW_ARTIFACT_NAME}' from workflow run ${run_id} (${workflow_used}) in '${ACTION_REPO}'."
         gh run download "${run_id}" --repo "${ACTION_REPO}" --name "${WORKFLOW_ARTIFACT_NAME}" --dir "${download_dir}"
 
         tarball_path="${download_dir}/${RELEASE_ASSET_NAME}"