From 74c5bff3e24ba53a8a5c4cf8f08f36705ecba3bd Mon Sep 17 00:00:00 2001 From: Yosuke Shimizu Date: Wed, 7 Oct 2026 19:59:23 +0900 Subject: [PATCH] ci: report unexpected openvpn failures under force-fail - check-workflow-result.sh's openvpn branch writes the actual-minus-expected failures to extra_sorted.txt and strips the optional tests from that file, in place of passing the list to comm as a filename. - The optional-failures line lists the optional tests that actually failed. --- .github/scripts/check-workflow-result.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/scripts/check-workflow-result.sh b/.github/scripts/check-workflow-result.sh index 53326c55..3fd52f4c 100755 --- a/.github/scripts/check-workflow-result.sh +++ b/.github/scripts/check-workflow-result.sh @@ -108,6 +108,7 @@ if [ "$WOLFPROV_FORCE_FAIL" = "WOLFPROV_FORCE_FAIL=1" ]; then ACTUAL_SORTED="${TEMP_DIR}/actual_sorted.txt" EXPECTED_SORTED="${TEMP_DIR}/expected_sorted.txt" OPTIONAL_SORTED="${TEMP_DIR}/optional_sorted.txt" + EXTRA_SORTED="${TEMP_DIR}/extra_sorted.txt" # Clean and sort both lists echo "$ACTUAL_FAILS" | tr ' ' '\n' | grep -v '^$' | sort > "$ACTUAL_SORTED" @@ -121,11 +122,11 @@ if [ "$WOLFPROV_FORCE_FAIL" = "WOLFPROV_FORCE_FAIL=1" ]; then # Find missing in actual (in expected but not in actual) MISSING=$(comm -23 "$EXPECTED_SORTED" "$ACTUAL_SORTED" | tr '\n' ' ') # Find extra in actual (in actual but not in expected) - EXTRA=$(comm -13 "$EXPECTED_SORTED" "$ACTUAL_SORTED" | tr '\n' ' ') + comm -13 "$EXPECTED_SORTED" "$ACTUAL_SORTED" > "$EXTRA_SORTED" # Strip out optional failures - EXTRA=$(comm -23 "$EXTRA" "$OPTIONAL_SORTED" | tr '\n' ' ') - # List the optional failures - OPTIONAL_FAILS=$(comm -13 "$EXPECTED_SORTED" "$OPTIONAL_SORTED" | tr '\n' ' ') + EXTRA=$(comm -23 "$EXTRA_SORTED" "$OPTIONAL_SORTED" | tr '\n' ' ') + # List the optional failures that occurred + OPTIONAL_FAILS=$(comm -12 "$EXTRA_SORTED" "$OPTIONAL_SORTED" | tr '\n' ' ') # Clean up temporary files rm -rf "$TEMP_DIR"