diff --git a/.github/jobs/check_for_error_logs.sh b/.github/jobs/check_for_error_logs.sh deleted file mode 100755 index 80832ce0e6..0000000000 --- a/.github/jobs/check_for_error_logs.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/bash - -json_data=$(curl -s -H "Authorization: Bearer ${GITHUB_TOKEN}" "https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/jobs") -error_log_jobs=$(echo "$json_data" | jq -r '.jobs[] | select(.name | startswith("Use Case Tests")) | .steps[] | select(.name | startswith("Save error logs")) | select(.conclusion | startswith("success"))') -# save output variable to merge error logs if any error logs were created -if [ ! -z "${error_log_jobs}" ]; then - echo "has_error_logs=true" >> $GITHUB_OUTPUT -else - echo "has_error_logs=false" >> $GITHUB_OUTPUT -fi diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7815636f01..a1d8f231a3 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -239,7 +239,16 @@ jobs: - uses: actions/checkout@v4 - name: Check for error logs id: check-for-error-logs - run: .github/jobs/check_for_error_logs.sh + run: | + json_data=$(curl -s -H "Authorization: Bearer ${{ github.token }}" \ + "https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs") + error_log_jobs=($(echo "$json_data" | jq -r '.jobs[] | select(.name | startswith("Use Case Tests")) | .steps[] | select(.name | startswith("Save error logs")) | select(.conclusion | startswith("success"))')) + # save output variable to merge error logs if any error logs were created + if [ ! -z "${error_log_jobs}" ]; then + echo "has_error_logs=true" >> $GITHUB_OUTPUT + else + echo "has_error_logs=false" >> $GITHUB_OUTPUT + fi - name: Merge Artifacts if: ${{ always() && steps.check-for-error-logs.outputs.has_error_logs == 'true' }} uses: actions/upload-artifact/merge@v4