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-forge.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 855eb15 updates for publish workflow changes
855eb15 is described below
commit 855eb15f6eda22e5ab723167435ac9cca392090f
Author: James Daugherty <[email protected]>
AuthorDate: Tue May 27 17:26:07 2025 -0400
updates for publish workflow changes
---
.github/workflows/release.yml | 20 ++++++++++----------
build.gradle | 6 +++---
grails-cli/build.gradle | 12 ++++++------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2bfef28..1a441eb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,6 +32,12 @@ jobs:
steps:
- name: "📥 Checkout repository"
uses: actions/checkout@v4
+ - 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:
@@ -53,25 +59,19 @@ jobs:
- name: "📤 Upload CLI Zip"
uses: softprops/action-gh-release@v2
with:
- files: grails-cli/build/distributions/apache-grails-${{
steps.release_version.outputs.value }}-incubating.zip
+ files: grails-cli/build/distributions/apache-grails-${{
steps.release_version.outputs.value }}-incubating-bin.zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: "🔐 Generate secring file"
- env:
- SECRING_FILE: ${{ secrets.SECRING_FILE }}
- run: echo $SECRING_FILE | base64 -d > ${{ github.workspace
}}/secring.gpg
- name: "📤 Publish to Sonatype OSSRH"
env:
GRAILS_PUBLISH_RELEASE: 'true'
NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }}
NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }}
- NEXUS_PUBLISH_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }}
- NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{
secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }}
- SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
- SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+ NEXUS_PUBLISH_URL: 'https://repository.apache.org/service/local/'
+ NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.STAGING_PROFILE_ID }}
+ SIGNING_KEY: ${{ secrets.GPG_KEY_ID }}
run: >
./gradlew
- -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg
-x initializeSonatypeStagingRepository
findSonatypeStagingRepository
publishToSonatype
diff --git a/build.gradle b/build.gradle
index 2107459..f9da6ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,8 +26,8 @@ group = 'org.apache.grails.forge'
// we must apply the publish configuration first or the aggregator plugin will
not work
apply from: layout.projectDirectory.file('gradle/publish-root-config.gradle')
-apply plugin: 'org.grails.forge.internal.aggregator'
+apply plugin: 'org.grails.forge.internal.aggregator'
ext {
buildInstant =
java.util.Optional.ofNullable(System.getenv('SOURCE_DATE_EPOCH'))
@@ -39,8 +39,8 @@ ext {
}
// buildSrc tests fail occasionally without running clean first
-build {
- dependsOn('clean')
+tasks.named('build').configure {
+ it.dependsOn(tasks.named('clean'))
}
apply {
diff --git a/grails-cli/build.gradle b/grails-cli/build.gradle
index 6971d8d..f703a4f 100644
--- a/grails-cli/build.gradle
+++ b/grails-cli/build.gradle
@@ -151,8 +151,8 @@ forgeCliStartScripts.configure { CreateStartScripts t ->
}
project.extensions.getByType(DistributionContainer).configureEach {
- it.distributionBaseName.set("apache-grails")
- it.distributionClassifier.set('incubating')
+ it.distributionBaseName.set('apache-grails')
+ it.distributionClassifier.set('incubating-bin')
it.contents {
from(shadowJarTask) {
into ".grails/$grailsVersion"
@@ -209,9 +209,9 @@ sdkman {
version = project.version
hashtag = '#grailsfw'
platforms = [
- 'MAC_ARM64' :
"https://github.com/apache/grails-forge/releases/download/v${project.version}/apache-grails-v${project.version}-incubating.zip";,
- 'MAC_OSX' :
"https://github.com/apache/grails-forge/releases/download/v${project.version}/apache-grails-v${project.version}-incubating.zip";,
- 'WINDOWS_64':
"https://github.com/apache/grails-forge/releases/download/v${project.version}/apache-grails-v${project.version}-incubating.zip";,
- 'LINUX_64' :
"https://github.com/apache/grails-forge/releases/download/v${project.version}/apache-grails-v${project.version}-incubating.zip";
+ 'MAC_ARM64' :
"https://github.com/apache/grails-forge/releases/download/v${project.version}/apache-grails-${project.version}-incubating-bin.zip";,
+ 'MAC_OSX' :
"https://github.com/apache/grails-forge/releases/download/v${project.version}/apache-grails-${project.version}-incubating-bin.zip";,
+ 'WINDOWS_64':
"https://github.com/apache/grails-forge/releases/download/v${project.version}/apache-grails-${project.version}-incubating-bin.zip";,
+ 'LINUX_64' :
"https://github.com/apache/grails-forge/releases/download/v${project.version}/apache-grails-${project.version}-incubating-bin.zip";
] as Map<? extends String, ? extends String>
}
\ No newline at end of file
