From 7e82c874846a654a7b8de8dfd996e2a707f17a86 Mon Sep 17 00:00:00 2001 From: Olli Lupton Date: Mon, 16 Oct 2023 12:01:14 +0200 Subject: [PATCH 1/2] triage: avoid skipping due to failed status of run-jobs.outcome --- .github/workflows/nightly-pax-test-mgmn.yaml | 2 +- .github/workflows/nightly-t5x-test-mgmn.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-pax-test-mgmn.yaml b/.github/workflows/nightly-pax-test-mgmn.yaml index db041cd77..806c48aac 100644 --- a/.github/workflows/nightly-pax-test-mgmn.yaml +++ b/.github/workflows/nightly-pax-test-mgmn.yaml @@ -154,7 +154,7 @@ jobs: triage: needs: [metadata, publish-completion] uses: ./.github/workflows/_triage.yaml - if: needs.publish-completion.outputs.STATUS != 'success' && ((github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || github.event_name == 'workflow_dispatch') + if: failure() && needs.publish-completion.outputs.STATUS != 'success' && ((github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || github.event_name == 'workflow_dispatch') secrets: inherit with: BROKEN_IMAGE: ${{ needs.metadata.outputs.PAX_IMAGE }} diff --git a/.github/workflows/nightly-t5x-test-mgmn.yaml b/.github/workflows/nightly-t5x-test-mgmn.yaml index 40fa91819..59d4297d2 100644 --- a/.github/workflows/nightly-t5x-test-mgmn.yaml +++ b/.github/workflows/nightly-t5x-test-mgmn.yaml @@ -116,7 +116,7 @@ jobs: triage: needs: [metadata, publish-completion] uses: ./.github/workflows/_triage.yaml - if: needs.publish-completion.outputs.STATUS != 'success' && ((github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || github.event_name == 'workflow_dispatch') + if: failure() && needs.publish-completion.outputs.STATUS != 'success' && ((github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || github.event_name == 'workflow_dispatch') secrets: inherit with: BROKEN_IMAGE: ${{ needs.metadata.outputs.T5X_IMAGE }} From 566e4e4488368e71424324d0e4691397cc41d189 Mon Sep 17 00:00:00 2001 From: Olli Lupton Date: Tue, 17 Oct 2023 17:51:07 +0200 Subject: [PATCH 2/2] fixes for naming when used as reusable workflow --- .github/workflows/_triage.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_triage.yaml b/.github/workflows/_triage.yaml index 24522bb44..543edd3c4 100644 --- a/.github/workflows/_triage.yaml +++ b/.github/workflows/_triage.yaml @@ -236,7 +236,7 @@ jobs: name_conclusion_array=() while IFS= read -r line; do name_conclusion_array+=("$line") - done < <(echo "$json_data" | jq -r '.jobs[] | select(.name | startswith("test-t5x-ff") and contains("outcome")) | "\(.name)\t\(.conclusion)"') + done < <(echo "$json_data" | jq -r '.jobs[] | select(.name | contains("test-t5x-ff") and endswith(" / outcome")) | "\(.name)\t\(.conclusion)"') TABLE_MD=$( cat <