From 945b4529c1a2a86283bf79d76ef5bfd1553ea720 Mon Sep 17 00:00:00 2001 From: jm96441n Date: Fri, 16 Aug 2024 14:34:01 -0400 Subject: [PATCH] this might be correct --- .github/scripts/goldenfile_checker.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/goldenfile_checker.sh b/.github/scripts/goldenfile_checker.sh index 0fef83fa68..5381628abb 100755 --- a/.github/scripts/goldenfile_checker.sh +++ b/.github/scripts/goldenfile_checker.sh @@ -4,19 +4,19 @@ set -euo pipefail +echo "origin/$GITHUB_BRANCH_REF" # check if there is a diff in the xds testdata directory after running `make envoy-regen` -make envoy-regen +echo "regenerating xds files" +make envoy-regen &>/dev/null -echo "origin/$GITHUB_BRANCH_REF" -echo "getting changed files" +echo "calculating changed files" changed_xds_files=$(git --no-pager diff --name-only HEAD "$(git merge-base HEAD "origin/$GITHUB_BRANCH_REF")" | egrep "agent/xds/testdata/.*" || true) -echo "got changed files" # If we do not find a file in .changelog/, we fail the check if [ -z "$changed_xds_files" ]; then # pass status check if no changes were found for xds files echo "Found no changes to xds golden files" exit 0 else - echo "Found diffs with xds golden files run $(make envoy-regen) to update them and check that output is expected" + echo "Found diffs with xds golden files run 'make envoy-regen' to update them and check that output is expected" exit 0 fi