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
The following commit(s) were added to refs/heads/7.0.x by this push:
new 57cc53fbce [skip tests] fix source differences, update verify, &
restore rat config exclude
57cc53fbce is described below
commit 57cc53fbce100f5b1df8cf6ea5acf4815cd4ca98
Author: James Daugherty <[email protected]>
AuthorDate: Wed Jun 4 03:19:58 2025 -0400
[skip tests] fix source differences, update verify, & restore rat config
exclude
---
.github/workflows/release-source-distribution.yml | 1 -
.github/workflows/release-upload.yml | 8 ++++----
etc/bin/verify.sh | 17 +++++++++++------
gradle/rat-root-config.gradle | 1 +
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/release-source-distribution.yml
b/.github/workflows/release-source-distribution.yml
index 56a5c7f64f..f9fdc81e47 100644
--- a/.github/workflows/release-source-distribution.yml
+++ b/.github/workflows/release-source-distribution.yml
@@ -46,7 +46,6 @@ jobs:
rm -f grails/grails-forge/gradle/wrapper/gradle-wrapper.properties
rm -f grails/grails-forge/gradlew
rm -f grails/KEYS
- find grails -type f -name '.gitattributes' -delete
- name: "Download CHECKSUMS.txt and rename to CHECKSUMS"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-upload.yml
b/.github/workflows/release-upload.yml
index 2c53de904d..97a0613616 100644
--- a/.github/workflows/release-upload.yml
+++ b/.github/workflows/release-upload.yml
@@ -75,7 +75,7 @@ jobs:
- name: "Remove existing dev version"
run: |
VERSION="${{ steps.release_version.outputs.version }}"
- cd dev-repo/core
+ cd dev-repo
if [ -d "$VERSION" ]; then
svn delete "$VERSION"
svn commit -m "Remove grails dev version $VERSION" --username
"$SVN_USERNAME" --password "$SVN_PASSWORD"
@@ -86,7 +86,7 @@ jobs:
run: |
TAG=${{ github.event.inputs.release_tag }}
VERSION=${{ steps.release_version.outputs.version }}
- cd dev-repo/core
+ cd dev-repo
mkdir -p $VERSION/sources
cd $VERSION/sources
curl -LO
https://github.com/apache/grails-core/releases/download/$TAG/apache-grails-$VERSION-incubating-src.zip
@@ -101,7 +101,7 @@ jobs:
run: |
TAG=${{ github.event.inputs.release_tag }}
VERSION=${{ steps.release_version.outputs.version }}
- cd dev-repo/core
+ cd dev-repo
mkdir -p $VERSION/distribution
cd $VERSION/distribution
curl -LO
https://github.com/apache/grails-forge/releases/download/$TAG/apache-grails-$VERSION-incubating-bin.zip
@@ -116,7 +116,7 @@ jobs:
run: |
TAG=${{ github.event.inputs.release_tag }}
VERSION=${{ steps.release_version.outputs.version }}
- cd dev-repo/core/$VERSION/distribution
+ cd dev-repo/$VERSION/distribution
curl -LO
https://github.com/apache/grails-core/releases/download/$TAG/apache-grails-wrapper-$VERSION-incubating-bin.zip
curl -LO
https://github.com/apache/grails-core/releases/download/$TAG/apache-grails-wrapper-$VERSION-incubating-bin.zip.sha512
curl -LO
https://github.com/apache/grails-core/releases/download/$TAG/apache-grails-wrapper-$VERSION-incubating-bin.zip.asc
diff --git a/etc/bin/verify.sh b/etc/bin/verify.sh
index 5a00f00f6c..4a92d28604 100755
--- a/etc/bin/verify.sh
+++ b/etc/bin/verify.sh
@@ -81,17 +81,22 @@ echo """
}
""" > "${DOWNLOAD_LOCATION}/custom-repos.gradle"
+echo "✅ Custom repo script written"
+
+echo "Bootstrap Gradle ..."
+cd "${DOWNLOAD_LOCATION}/grails/gradle-bootstrap"
+gradlew
+echo "✅ Gradle Bootstrapped"
+
+echo "Verifying Reproducible Build ..."
+verify-reproducible.sh "${DOWNLOAD_LOCATION}"
+echo "✅ Reproducible Build Verified"
echo "Be sure to do the following:"
echo "☑️ Run the wrapper ShellApp: cd
${DOWNLOAD_LOCATION}/apache-grails-wrapper-${VERSION}-incubating-bin/ShellApp
&& ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
echo "☑️ Run the wrapper ForgeApp: cd
${DOWNLOAD_LOCATION}/apache-grails-wrapper-${VERSION}-incubating-bin/ForgeApp
&& ./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
echo "☑️ Run the cli ShellApp: cd
${DOWNLOAD_LOCATION}/apache-grails-${VERSION}-incubating-bin/ShellApp &&
./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
echo "☑️ Run the cli ForgeApp: cd
${DOWNLOAD_LOCATION}/apache-grails-${VERSION}-incubating-bin/ForgeApp &&
./gradlew bootRun --init-script ~/grails-verify/custom-repos.gradle"
-echo "☑️ run the reproducible build test (see below)"
-
-# I have no idea why this needs done manually, but if it's run from this
script gradle happily ignores the settings.gradle and tries to build (so it
fails)
-echo " Unable to bootstrap gradle manually. Please bootstrap by running
the gradle 'wrapper' task in grails & grails/grails-gradle."
-echo " After bootstrapping, call verify-reproducible.sh
'${DOWNLOAD_LOCATION}'"
-echo ""
+echo "☑️ Run the shell cli from one of the applications and ensure all
commands show as expected - pay attention to the scaffolding ones since they
are dynamically loaded"
echo "✅✅✅ Verification finished, see above instructions for remaining manual
testing."
\ No newline at end of file
diff --git a/gradle/rat-root-config.gradle b/gradle/rat-root-config.gradle
index cc0747fbc7..42a00872c6 100644
--- a/gradle/rat-root-config.gradle
+++ b/gradle/rat-root-config.gradle
@@ -35,6 +35,7 @@ tasks.named('rat') {
'grails-web-common/src/main/groovy/org/grails/web/json/JSONWriter.java',
'gradle/wrapper/gradle-wrapper.properties', // gradle wrapper
excluded from src zip
'**/build/**', // Gradle generated build directories
+ '.gitattributes', // git configuration isn't code
'**/.gradle/**', '**/wrapper/**', 'gradlew*', // gradle wrapper
files excluded from src zip
'**/*.html', // html files are only in test
'**/resources/*', // exclude test artifacts
