You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2025/06/11 17:46:38 UTC
(grails-forge) branch cli-fix created (now 066500c)
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch cli-fix
in repository https://gitbox.apache.org/repos/asf/grails-forge.git
at 066500c add cli fix workflow
This branch includes the following new commits:
new 1ea6f3e fix distribution to be compatible with sdkman
new 066500c add cli fix workflow
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(grails-forge) 02/02: add cli fix workflow
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch cli-fix
in repository https://gitbox.apache.org/repos/asf/grails-forge.git
commit 066500c1466c594fad05f5193271d6a14039797a
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Jun 11 13:46:28 2025 -0400
add cli fix workflow
---
.github/workflows/cli-fix.yml | 64 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/.github/workflows/cli-fix.yml b/.github/workflows/cli-fix.yml
new file mode 100644
index 0000000..016af11
--- /dev/null
+++ b/.github/workflows/cli-fix.yml
@@ -0,0 +1,64 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "CLI - fix"
+on:
+ workflow_dispatch:
+jobs:
+ publish:
+ runs-on: ubuntu-24.04
+ permissions:
+ contents: write # to create release and upload wrapper
+ steps:
+ - name: "📥 Checkout repository"
+ uses: actions/checkout@v4
+ - name: 'Ensure Common Build Date'
+ run: |
+ echo "SOURCE_DATE_EPOCH=1749021699" >> "$GITHUB_ENV"
+ - name: "Ensure source files use common date"
+ run: |
+ find . -depth \( -type f -o -type d \) -exec touch -d "@${SOURCE_DATE_EPOCH}" {} +
+ - name: '🔐 Set up GPG'
+ run: |
+ echo "${{ secrets.GRAILS_GPG_KEY }}" | gpg --batch --import
+ gpg --list-keys
+ env:
+ GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+ - name: "☕️ Setup JDK"
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'liberica'
+ java-version: '17'
+ - name: "🐘 Setup Gradle"
+ uses: gradle/actions/setup-gradle@v4
+ with:
+ develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
+ - name: "🧩 Assemble"
+ run: ./gradlew assemble
+ - name: "🔏 Sign CLI ZIP"
+ env:
+ GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+ run: |
+ gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign grails-cli/build/distributions/apache-grails-7.0.0-M4-incubating-bin.zip
+ - name: "📦 Create CLI checksum"
+ run: |
+ cd grails-cli/build/distributions
+ sha512sum apache-grails-7.0.0-M4-incubating-bin.zip > "apache-grails-7.0.0-M4-incubating-bin.zip.sha512"
+ - name: "📤 Upload CLI Zip to Workflow Summary Page"
+ uses: actions/upload-artifact@v4
+ with:
+ name: 'combined-cli'
+ path: grails-cli/build/distributions/apache-grails-7.0.0-M4-incubating-bin.*
+ if-no-files-found: 'error'
\ No newline at end of file
(grails-forge) 01/02: fix distribution to be compatible with sdkman
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch cli-fix
in repository https://gitbox.apache.org/repos/asf/grails-forge.git
commit 1ea6f3e31678a933fb99beb87e07c267e404a9e8
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Jun 11 09:14:38 2025 -0400
fix distribution to be compatible with sdkman
---
.github/workflows/gradle.yml | 2 +-
grails-cli/build.gradle | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 9bd3ac9..ec05271 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -55,7 +55,7 @@ jobs:
cp grails-cli/build/distributions/apache-grails-*.zip cli.zip
unzip cli -d tmp1
mv tmp1/apache-grails-* tmp1/cli
- ./tmp1/cli/grails --version
+ ./tmp1/cli/bin/grails --version
- name: "📤 Upload CLI Zip to Workflow Summary Page"
if: ${{ matrix.java == '17' }}
uses: actions/upload-artifact@v4
diff --git a/grails-cli/build.gradle b/grails-cli/build.gradle
index 2a7b890..94c1aaa 100644
--- a/grails-cli/build.gradle
+++ b/grails-cli/build.gradle
@@ -143,11 +143,9 @@ forgeCliStartScripts.configure { CreateStartScripts t ->
doLast {
t.unixScript.text = t.unixScript.text
.replace('$APP_HOME/lib/', "\$APP_HOME/.grails/$grailsVersion/")
- .replace('"${APP_HOME:-./}.."', '"${APP_HOME:-./}"')
t.windowsScript.text = t.windowsScript.text
.replace('%APP_HOME%\\lib\\', "%APP_HOME%\\.grails\\$grailsVersion\\")
- .replace('%DIRNAME%..', '%DIRNAME%')
}
}
@@ -156,26 +154,26 @@ project.extensions.getByType(DistributionContainer).configureEach {
it.distributionClassifier.set('incubating-bin')
it.contents {
from(shadowJarTask) {
- into ".grails/$grailsVersion"
+ into "bin/.grails/$grailsVersion"
}
from(cliStartScripts) {
- into ''
+ into 'bin'
fileMode = 0755
}
from(shellCliStartScripts) {
- into ''
+ into 'bin'
fileMode = 0755
}
from(forgeCliStartScripts) {
- into ''
+ into 'bin'
fileMode = 0755
}
from(rootProject.project(':grails-forge-cli').layout.buildDirectory.file('exploded/bin/grails_forge_cli_completion')) {
- into ''
+ into 'bin'
fileMode = 0755
}