This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 691a88f4a9392e0b4c0c1c1ad1d7c6fb10d64a1a Author: James Daugherty <[email protected]> AuthorDate: Fri May 30 19:57:26 2025 -0400 [skip ci] use the same directory naming scheme that the reproducible build test script uses --- etc/bin/verify-jar-artifacts.sh | 2 +- etc/bin/verify-reproducible.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/bin/verify-jar-artifacts.sh b/etc/bin/verify-jar-artifacts.sh index 7d725073d6..f85b739679 100755 --- a/etc/bin/verify-jar-artifacts.sh +++ b/etc/bin/verify-jar-artifacts.sh @@ -59,7 +59,7 @@ REPO_BASE_URL="https://repository.apache.org/content/repositories/${STAGING_REPO cd grails # Create a temporary directory to work in -WORK_DIR='etc/bin/results/published' +WORK_DIR='etc/bin/results/first' mkdir -p $WORK_DIR echo "Using temp dir: $WORK_DIR" cd "$WORK_DIR" diff --git a/etc/bin/verify-reproducible.sh b/etc/bin/verify-reproducible.sh index 5d17676727..fc679b009d 100755 --- a/etc/bin/verify-reproducible.sh +++ b/etc/bin/verify-reproducible.sh @@ -43,10 +43,10 @@ else fi export SOURCE_DATE_EPOCH=$(cat "${DOWNLOAD_LOCATION}/grails/BUILD_DATE") -if [[ -d "${DOWNLOAD_LOCATION}/grails/etc/bin/results/published" ]]; then - echo "✅ Directory 'published' exists." +if [[ -d "${DOWNLOAD_LOCATION}/grails/etc/bin/results/first" ]]; then + echo "✅ Directory 'first' exists." else - echo "❌ Directory 'published' not found. Please place the PUBLISHED jar files under ${DOWNLOAD_LOCATION}/grails/etc/bin/results/published..." + echo "❌ Directory 'first' not found. Please place the published jar files under ${DOWNLOAD_LOCATION}/grails/etc/bin/results/first..." exit 1 fi @@ -75,9 +75,9 @@ echo "$DIFF_RESULTS" > diff.txt cat diff.txt printf '%s\n' "$DIFF_RESULTS" | sed 's|^etc/bin/results/||' > toPurge.txt -find published -type f -name '*.jar' -print | sed 's|^published/||' | grep -F -x -v -f toPurge.txt | +find first -type f -name '*.jar' -print | sed 's|^first/||' | grep -F -x -v -f toPurge.txt | while IFS= read -r f; do - rm -f "./published/$f" + rm -f "./first/$f" done find second -type f -name '*.jar' -print | sed 's|^second/||' | grep -F -x -v -f toPurge.txt | while IFS= read -r f; do
