Skip to content

Commit 8ddeb51

Browse files
committed
checksum comparison for _toolbar.html.erb was comparing for equality as opposed to the expected diff
1 parent 6779447 commit 8ddeb51

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
env:
1010
BUILD_SUFFIX: -build-${{ github.run_id }}_${{ github.run_attempt }}
1111
DOCKER_METADATA_SET_OUTPUT_ENV: 'true'
12+
ARCHIVESSPACE_RESOURCE_TOOLBAR_DIFF_SHA256: 5122e9837c25fefe58d64ff499e570b5120f527f3654de4bb0acac22d5cfc1ed
1213

1314
jobs:
1415
build:
@@ -156,8 +157,9 @@ jobs:
156157
csum="$(printf '%s' "$diff_output" | sha256sum | cut -f1 -d' ')"
157158
echo "Toolbar diff checksum: $csum"
158159
159-
if [[ "$csum" != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ]]; then
160-
echo "resources/_toolbar.html.erb differs from upstream extracted WAR file"
160+
if [[ "$csum" != "$ARCHIVESSPACE_RESOURCE_TOOLBAR_DIFF_SHA256" ]]; then
161+
echo "Expected diff checksum: $ARCHIVESSPACE_RESOURCE_TOOLBAR_DIFF_SHA256"
162+
echo "resources/_toolbar.html.erb diff changed from the expected override patch"
161163
printf '%s\n' "$diff_output" | head -n 120
162164
exit 1
163165
fi

0 commit comments

Comments
 (0)