From bd6e4271e40c1f87888d08cdc34de2d4b55cb0b0 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 9 Dec 2025 00:48:59 -0500 Subject: [PATCH] Add `|| true` to handle how `cmp` was returning a non-zero code for the (expectedly) different files --- .github/workflows/stack_size.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/stack_size.yml b/.github/workflows/stack_size.yml index ba12c5a5..b0b980b8 100644 --- a/.github/workflows/stack_size.yml +++ b/.github/workflows/stack_size.yml @@ -49,13 +49,6 @@ jobs: rm ./sh done - find . -iname "monerod-*" | while read -r bin; do - readelf $bin -l - sha256sum $bin - done - - echo "Verifying artifacts are equivalent" - sha256() { sha256sum "$1" | cut -d' ' -f1 } @@ -68,8 +61,6 @@ jobs: fi done - echo "Verified artifacts are equivalent" - read_stack() { STACK_INFO=$(readelf "$1" -l | grep STACK -A1) MEMSZ=$(echo "$STACK_INFO" | tail -n1 | sed -E s/^[[:space:]]*//g | cut -f2 -d' ') @@ -81,25 +72,15 @@ jobs: exit 2 fi - echo "Verified \`read_stack\` agrees the binary started with 0" - UPDATED_STACK=$(read_stack monerod-chelf) if [ "$UPDATED_STACK" -ne "$STACK" ]; then echo "Updated \`PT_GNU_STACK\` ($UPDATED_STACK) wasn't 8 MB ($STACK)" exit 3 fi - echo "Verified \`read_stack\` agrees the binary's stack is now 8 MB" - # Only one byte should be different due to the bit pattern of 8 MB - ls monerod - ls monerod-chelf - cmp --help - BYTES_DIFFERENT=$(cmp -l monerod monerod-chelf | wc -l) - echo $BYTES_DIFFERENT + BYTES_DIFFERENT=$(cmp -l monerod monerod-chelf | wc -l || true) if [ "$BYTES_DIFFERENT" -ne 1 ]; then echo "More than one byte was different between the two binaries" exit 4 fi - - echo "Verified only a single byte is different between the two binaries"