fix

Author: ydshieh

.github/workflows/check_failed_tests.yml

@@ -147,7 +147,7 @@ jobs:
   check_new_failures:
     name: "Find commits for new failing tests"
     needs: setup_check_new_failures
-    if: ${{ needs.setup_check_new_failures.outputs.process == 'true' }}
+    if: needs.setup_check_new_failures.outputs.process == 'true'
     strategy:
       matrix:
         run_idx: ${{ fromJson(needs.setup_check_new_failures.outputs.matrix) }}
@@ -219,30 +219,9 @@ jobs:
 
             core.setOutput('merge_commit_base_sha', merge_commit.parents[0].sha);
 
-      - name: Get workflow ID
-        if: ${{ inputs.pr_number == '' }}
-        id: get-workflow-id
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SOURCE_WORKFLOW_RUN_ID: ${{ inputs.source_workflow_run_id }}
-          WORKFLOW_RUN_ID: ${{ github.run_id }}
-          RUN_ID: ${{ inputs.source_workflow_run_id || github.run_id }}
-          REPO: ${{ github.repository }}
-        run: |
-          workflow_id=$(python3 << 'EOF'
-          import requests, os
-        
-          url = f"https://api.github.com/repos/{os.environ['REPO']}/actions/runs/{os.environ['RUN_ID']}"
-          headers = {"Authorization": f"Bearer {os.environ['GH_TOKEN']}"}
-          print(requests.get(url, headers=headers).json()["workflow_id"])
-          EOF
-          )
-
-          echo "workflow_id=$workflow_id" >> $GITHUB_OUTPUT
-          echo "SOURCE_WORKFLOW_RUN_ID: $SOURCE_WORKFLOW_RUN_ID"          
-          echo "WORKFLOW_RUN_ID: $WORKFLOW_RUN_ID"
-          echo "RUN_ID: $RUN_ID"
-          echo "workflow_id: $workflow_id"
+      - name: Set `END_SHA` from artifact override
+        if: ${{ needs.setup_check_new_failures.outputs.end_sha != '' }}
+        run: echo "END_SHA=${{ needs.setup_check_new_failures.outputs.end_sha }}" >> $GITHUB_ENV
 
       # Usually, `END_SHA` should be the commit of the last previous workflow run of the **SAME** (scheduled) workflow.
       # (This is why we don't need to specify `workflow_id` which would be fetched automatically in the python script.)
@@ -253,17 +232,13 @@ jobs:
           ACCESS_TOKEN: ${{ secrets.ACCESS_REPO_INFO_TOKEN }}
           WORKFLOW_ID: ${{ steps.get-workflow-id.outputs.workflow_id }}
         run: |
-          echo "END_SHA=$(TOKEN="$ACCESS_TOKEN" python3 -c 'import os; from get_previous_daily_ci import get_last_daily_ci_run_commit; commit=get_last_daily_ci_run_commit(token=os.environ["TOKEN"], workflow_run_id=os.environ["PREV_WORKFLOW_RUN_ID"], workflow_id=os.environ["WORKFLOW_ID"]); print(commit)')" >> $GITHUB_ENV
-
-      - name: Set `END_SHA` from artifact override
-        if: ${{ needs.setup_check_new_failures.outputs.end_sha != '' }}
-        run: echo "END_SHA=${{ needs.setup_check_new_failures.outputs.end_sha }}" >> $GITHUB_ENV
+          echo "END_SHA=$(TOKEN="$ACCESS_TOKEN" python3 -c 'import os; from get_previous_daily_ci import get_last_daily_ci_run_commit; commit=get_last_daily_ci_run_commit(token=os.environ["TOKEN"], workflow_run_id=os.environ["PREV_WORKFLOW_RUN_ID"]); print(commit)')" >> $GITHUB_ENV
 
       # However, for workflow runs triggered by `issue_comment` (for pull requests), we want to check against the
       # parent commit (on `main`) of the `merge_commit` (dynamically created by GitHub). In this case, the goal is to
       # see if a reported failing test is actually ONLY failing on the `merge_commit`.
       - name: Set `END_SHA`
-        if: ${{ inputs.pr_number != '' }}
+        if: ${{ inputs.pr_number != '' && needs.setup_check_new_failures.outputs.end_sha == '' }}
         env:
           merge_commit_base_sha: ${{ steps.pr_info.outputs.merge_commit_base_sha }}
         run: |
@@ -296,8 +271,7 @@ jobs:
           n_runners: ${{ needs.setup_check_new_failures.outputs.n_runners }}
           run_idx: ${{ matrix.run_idx }}
           pr_number: ${{ inputs.pr_number }}
-        run: |
-          python3 utils/check_bad_commit.py --start_commit "$START_SHA" --end_commit "$END_SHA" --file "ci_results_${job}/new_failures.json" --output_file "new_failures_with_bad_commit_${job}_${run_idx}.json"
+        run: python3 utils/check_bad_commit.py --start_commit "$START_SHA" --end_commit "$END_SHA" --file "ci_results_${job}/new_failures.json" --output_file "new_failures_with_bad_commit_${job}_${run_idx}.json"
 
       - name: Show results
         working-directory: /transformers