diff --git a/.github/workflows/GnuTests.yml b/.github/workflows/GnuTests.yml index 4afa7daf3..15537d8b3 100644 --- a/.github/workflows/GnuTests.yml +++ b/.github/workflows/GnuTests.yml @@ -167,6 +167,7 @@ jobs: have_new_failures="" REF_LOG_FILE='${{ steps.vars.outputs.path_reference }}/test-logs/test-suite.log' REF_SUMMARY_FILE='${{ steps.vars.outputs.path_reference }}/test-summary/gnu-result.json' + REPO_DEFAULT_BRANCH='${{ steps.vars.outputs.repo_default_branch }}' if test -f "${REF_LOG_FILE}"; then echo "Reference SHA1/ID: $(sha1sum -- "${REF_SUMMARY_FILE}")" REF_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" "${REF_LOG_FILE}" | sort) diff --git a/util/compare_gnu_result.py b/util/compare_gnu_result.py index cfd33ea4c..9501f4f5f 100755 --- a/util/compare_gnu_result.py +++ b/util/compare_gnu_result.py @@ -9,6 +9,8 @@ import json import sys from os import environ +REPO_DEFAULT_BRANCH = environ.get('REPO_DEFAULT_BRANCH', 'main') + NEW = json.load(open("gnu-result.json")) OLD = json.load(open("main-gnu-result.json")) @@ -24,12 +26,12 @@ skip_d = int(current["skip"]) - int(last["skip"]) # Get an annotation to highlight changes print( - f"::warning ::Changes from main: PASS {pass_d:+d} / FAIL {fail_d:+d} / ERROR {error_d:+d} / SKIP {skip_d:+d} " + f"::warning ::Changes from '{REPO_DEFAULT_BRANCH}': PASS {pass_d:+d} / FAIL {fail_d:+d} / ERROR {error_d:+d} / SKIP {skip_d:+d} " ) # If results are worse fail the job to draw attention if pass_d < 0: print( - f"::error ::PASS count is reduced from main: PASS {pass_d:+d} " + f"::error ::PASS count is reduced from '{REPO_DEFAULT_BRANCH}': PASS {pass_d:+d} " ) sys.exit(1)