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/05/14 15:37:46 UTC

(grails-forge) 04/04: distribute the combined distribution instead of the native binaries for forge

This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch wrapper-rewrite
in repository https://gitbox.apache.org/repos/asf/grails-forge.git

commit 74b40184e692595fdd05b36a15b3643621979920
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed May 14 11:37:32 2025 -0400

    distribute the combined distribution instead of the native binaries for forge
---
 .github/workflows/gradle.yml                       | 163 +-----------------
 .github/workflows/release.yml                      | 186 +--------------------
 ...g.grails.forge.internal.build.cli-module.gradle |   1 -
 grails-cli/build.gradle                            |  16 ++
 grails-forge-cli/build.gradle                      |  15 --
 5 files changed, 27 insertions(+), 354 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b4e15d0..68b0f3c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -44,170 +44,23 @@ jobs:
       - name: "🔨 Run Build"
         id: build
         run: ./gradlew build
-      - name: "✅ Verify CLI"
+      - name: "✅ Verify Forge CLI"
         if: success()
         run: |
           cp grails-forge-cli/build/distributions/grails-forge-cli-*.zip forge-cli.zip
           unzip forge-cli -d tmp
           mv tmp/grails-forge-cli-* tmp/forge-cli
           ./tmp/forge-cli/bin/grails --version
+      - name: "✅ Verify Combined CLI"
+        if: success()
+        run: |
+          cp grails-cli/build/distributions/grails-cli-*.zip cli.zip
+          unzip cli -d tmp
+          mv tmp/grails-cli-* tmp/cli
+          ./tmp/cli/grails --version
       - name: "📤 Upload CLI Zip to Workflow Summary Page"
         if: ${{ matrix.java == '17' }}
         uses: actions/upload-artifact@v4
         with:
           name: grails-cli-snapshot
           path: cli.zip
-  linux:
-    name: "Build Linux Native CLI"
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: "📥 Checkout the repository"
-        uses: actions/checkout@v4
-      - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '17'
-          distribution: 'graalvm-community'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
-      - name: "📸 Build the Native Image"
-        run: ./gradlew grails-forge-cli:nativeCompile --no-daemon
-      - name: "✅ Verify Build"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails --version
-      - name: "✅ Verify Create App"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails create-app test
-      - name: "📦 Package Build"
-        env:
-          VERSION: ${{ github.event.release.tag_name }}
-        run: |
-          mkdir -p grails-linux-amd64-snapshot/bin
-          mv ./grails-forge-cli/build/native/nativeCompile/grails grails-linux-amd64-snapshot/bin
-          cp ./LICENSE grails-linux-amd64-snapshot/
-          zip -r grails-linux-amd64-snapshot.zip ./grails-linux-amd64-snapshot
-      - name: "📤 Upload Artifact to Workflow Summary Page"
-        uses: actions/upload-artifact@v4
-        with:
-          name: grails-linux-amd64-snapshot
-          path: grails-linux-amd64-snapshot.zip
-  macos:
-    name: "Build OS X Intel Native CLI"
-    runs-on: macos-13
-    needs: build
-    steps:
-      - name: "📥 Checkout the repository"
-        uses: actions/checkout@v4
-      - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '17'
-          distribution: 'graalvm-community'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
-      - name: "📸 Build the Native Image"
-        run: ./gradlew grails-forge-cli:nativeCompile --no-daemon
-      - name: "✅ Verify Build"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails --version
-      - name: "✅ Verify Create App"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails create-app test
-      - name: "📦 Package Build"
-        env:
-          VERSION: ${{ github.event.release.tag_name }}
-        run: |
-          mkdir -p grails-darwin-amd64-snapshot/bin
-          mv ./grails-forge-cli/build/native/nativeCompile/grails grails-darwin-amd64-snapshot/bin
-          cp ./LICENSE grails-darwin-amd64-snapshot/
-          zip -r grails-darwin-amd64-snapshot.zip ./grails-darwin-amd64-snapshot -x '*.DS_Store*' -x '__MAC_OSX'
-      - name: "📤 Upload Artifact to Workflow Summary Page"
-        uses: actions/upload-artifact@v4
-        with:
-          name: grails-darwin-amd64-snapshot
-          path: grails-darwin-amd64-snapshot.zip
-  macos-arm:
-    name: "Build OS X Arm Native CLI"
-    runs-on: macos-latest
-    needs: [build]
-    steps:
-      - name: "📥 Checkout repository"
-        uses: actions/checkout@v4
-      - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '17'
-          distribution: 'graalvm-community'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
-      - name: "📸 Build the Native Image"
-        run: ./gradlew grails-forge-cli:nativeCompile --no-daemon
-      - name: "✅ Verify Build"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails --version
-      - name: "✅ Verify Create App"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails create-app test
-      - name: "📦 Package Build"
-        env:
-          VERSION: ${{ github.event.release.tag_name }}
-        run: |
-          mkdir -p grails-darwin-aarch64-snapshot/bin
-          mv ./grails-forge-cli/build/native/nativeCompile/grails grails-darwin-aarch64-snapshot/bin
-          cp ./LICENSE grails-darwin-aarch64-snapshot/
-          zip -r grails-darwin-aarch64-snapshot.zip grails-darwin-aarch64-snapshot/ -x '*.DS_Store*' -x '__MAC_OSX'
-      - name: "📤 Upload Artifact to Workflow Summary Page"
-        uses: actions/upload-artifact@v4
-        with:
-          name: grails-darwin-aarch64-snapshot
-          path: grails-darwin-aarch64-snapshot.zip
-  windows:
-    name: "Build Windows Native CLI"
-    runs-on: windows-latest
-    needs: build
-    steps:
-      - name: "📥 Checkout the repository"
-        uses: actions/checkout@v4
-      - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '17'
-          distribution: 'graalvm-community'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
-      - name: "📸 Build the Native Image"
-        run: ./gradlew grails-forge-cli:nativeCompile --no-daemon
-      - name: "✅ Verify Build (Powershell)"
-        shell: powershell
-        run: ./grails-forge-cli/build/native/nativeCompile/grails.exe --version
-      - name: "✅ Verify Create App (Powershell)"
-        shell: powershell
-        run: ./grails-forge-cli/build/native/nativeCompile/grails.exe create-app test
-      - name: "✅ Verify Build (CMD)"
-        shell: cmd
-        run: grails-forge-cli\\build\\native\\nativeCompile\\grails --version
-      - name: "✅ Verify Create App (CMD)"
-        shell: cmd
-        run: grails-forge-cli\\build\\native\\nativeCompile\\grails create-app test2
-      - name: "📦 ZIP Archive"
-        run: |
-          New-Item "./grails-win-amd64-snapshot/bin" -ItemType Directory -ea 0
-          Move-Item -Path ./grails-forge-cli/build/native/nativeCompile/grails.exe -Destination "./grails-win-amd64-snapshot/bin"
-          Copy-Item "./LICENSE" -Destination "./grails-win-amd64-snapshot"
-          Compress-Archive -Path "./grails-win-amd64-snapshot" -Update -DestinationPath ./grails-win-amd64-snapshot.zip
-      - name: "📤 Upload Artifact to Workflow Summary Page"
-        uses: actions/upload-artifact@v4
-        with:
-          name: grails-win-amd64-snapshot
-          path: ./grails-win-amd64-snapshot.zip
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fce1735..82cd5ce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,8 +60,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: grails-forge-cli/build/distributions/grails-forge-cli-${{ steps.release_version.outputs.value }}.zip
-          asset_name: grails-forge-cli-${{ steps.release_version.outputs.value }}.zip
+          asset_path: grails-cli/build/distributions/grails-cli-${{ steps.release_version.outputs.value }}.zip
+          asset_name: grails-cli-${{ steps.release_version.outputs.value }}.zip
           asset_content_type: application/zip
       - name: "🚀 Publish to Github Pages"
         if: success()
@@ -76,190 +76,10 @@ jobs:
         uses: grails/grails-github-actions/post-release@asf
         env:
           RELEASE_SCRIPT_PATH: '.github/scripts/setSnapshotGrailsVersion.sh'
-  linux:
-    name: "Release Linux Native CLI"
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: "📥 Checkout repository"
-        uses: actions/checkout@v4
-        with:
-          ref: v${{ needs.build.outputs.release_version }}
-      - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '17'
-          distribution: 'graalvm-community'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-      - name: "📸 Build the Native Image"
-        run: ./gradlew grails-forge-cli:nativeCompile --no-daemon
-      - name: "✅ Verify Build"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails --version
-      - name: "✅ Verify Create App"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails create-app test
-      - name: "📦 Package Build"
-        env:
-          VERSION: ${{ github.event.release.tag_name }}
-        run: |
-          mkdir -p "grails-linux-amd64-${VERSION}/bin"
-          mv ./grails-forge-cli/build/native/nativeCompile/grails "grails-linux-amd64-${VERSION}/bin"
-          cp ./LICENSE "grails-linux-amd64-${VERSION}/"
-          zip -r "grails-linux-amd64-${VERSION}.zip" "grails-linux-amd64-${VERSION}/"
-      - name: "📤 Upload Release Asset"
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./grails-linux-amd64-${{ github.event.release.tag_name }}.zip
-          asset_name: grails-linux-amd64-${{ github.event.release.tag_name }}.zip
-          asset_content_type: application/zip
-  macos:
-    name: "Release OS X Intel Native CLI"
-    runs-on: macos-13
-    needs: build
-    steps:
-      - name: "📥 Checkout repository"
-        uses: actions/checkout@v4
-        with:
-          ref: v${{ needs.build.outputs.release_version }}
-      - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '17'
-          distribution: 'graalvm-community'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
-      - name: "📸 Build the Native Image"
-        run: ./gradlew grails-forge-cli:nativeCompile --no-daemon
-      - name: "✅ Verify Build"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails --version
-      - name: "✅ Verify Create App"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails create-app test
-      - name: "📦 Package Build"
-        env:
-          VERSION: ${{ github.event.release.tag_name }}
-        run: |
-          mkdir -p "grails-darwin-amd64-${VERSION}/bin"
-          mv ./grails-forge-cli/build/native/nativeCompile/grails "grails-darwin-amd64-${VERSION}/bin"
-          cp ./LICENSE "grails-darwin-amd64-${VERSION}/"
-          zip -r "grails-darwin-amd64-${VERSION}.zip" "grails-darwin-amd64-${VERSION}/" -x '*.DS_Store*' -x '__MAC_OSX'
-      - name: "📤 Upload Release Asset"
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./grails-darwin-amd64-${{ github.event.release.tag_name }}.zip
-          asset_name: grails-darwin-amd64-${{ github.event.release.tag_name }}.zip
-          asset_content_type: application/zip
-  macos-arm:
-    name: "Release OS X Arm Native CLI"
-    runs-on: macos-latest
-    needs: build
-    steps:
-      - name: "📥 Checkout repository"
-        uses: actions/checkout@v4
-        with:
-          ref: v${{ needs.build.outputs.release_version }}
-      - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '17'
-          distribution: 'graalvm-community'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
-      - name: "📸 Build the Native Image"
-        run: ./gradlew grails-forge-cli:nativeCompile --no-daemon
-      - name: "✅ Verify Build"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails --version
-      - name: "✅ Verify Create App"
-        run: ./grails-forge-cli/build/native/nativeCompile/grails create-app test
-      - name: "📦 Package Build"
-        env:
-          VERSION: ${{ github.event.release.tag_name }}
-        run: |
-          mkdir -p "grails-darwin-aarch64-${VERSION}/bin"
-          mv ./grails-forge-cli/build/native/nativeCompile/grails "grails-darwin-aarch64-${VERSION}/bin"
-          cp ./LICENSE "grails-darwin-aarch64-${VERSION}/"
-          zip -r "grails-darwin-aarch64-${VERSION}.zip" "grails-darwin-aarch64-${VERSION}/" -x '*.DS_Store*' -x '__MAC_OSX'
-      - name: "📤 Upload Release Asset"
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./grails-darwin-aarch64-${{ github.event.release.tag_name }}.zip
-          asset_name: grails-darwin-aarch64-${{ github.event.release.tag_name }}.zip
-          asset_content_type: application/zip
-  windows:
-    name: "Release Windows Native CLI"
-    runs-on: windows-latest
-    needs: build
-    steps:
-      - name: "📥 Checkout repository"
-        uses: actions/checkout@v4
-        with:
-          ref: v${{ needs.build.outputs.release_version }}
-      - name: "☕️ Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '17'
-          distribution: 'graalvm-community'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: "🐘 Setup Gradle"
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY  }}
-      - name: "📸 Build the Native Image"
-        run: ./gradlew grails-forge-cli:nativeCompile --no-daemon
-      - name: "✅ Verify Build (Powershell)"
-        shell: powershell
-        run: ./grails-forge-cli/build/native/nativeCompile/grails.exe --version
-      - name: "✅ Verify Create App (Powershell)"
-        shell: powershell
-        run: ./grails-forge-cli/build/native/nativeCompile/grails.exe create-app test
-      - name: "✅ Verify Build (CMD)"
-        shell: cmd
-        run: grails-forge-cli\\build\\native\\nativeCompile\\grails --version
-      - name: "✅ Verify Create App (CMD)"
-        shell: cmd
-        run: grails-forge-cli\\build\\native\\nativeCompile\\grails create-app test2
-      - name: "📦 ZIP Archive"
-        run: |
-          New-Item ./grails-win-amd64-${{ github.event.release.tag_name }}/bin -ItemType Directory -ea 0
-          Move-Item -Path ./grails-forge-cli/build/native/nativeCompile/grails.exe -Destination ./grails-win-amd64-${{ github.event.release.tag_name }}/bin
-          Copy-Item ./LICENSE -Destination ./grails-win-amd64-${{ github.event.release.tag_name }}
-          Compress-Archive -Path ./grails-win-amd64-${{ github.event.release.tag_name }} -Update -DestinationPath ./grails-win-amd64-${{ github.event.release.tag_name }}.zip
-      - name: "📤 Upload Release Asset"
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./grails-win-amd64-${{ github.event.release.tag_name }}.zip
-          asset_name: grails-win-amd64-${{ github.event.release.tag_name }}.zip
-          asset_content_type: application/zip
   sdkman:
     name: "Release to SDKMAN!"
     runs-on: ubuntu-latest
-    needs: [build, linux, macos, macos-arm, windows]
+    needs: [build]
     steps:
       - name: "📥 Checkout repository"
         uses: actions/checkout@v4
diff --git a/buildSrc/src/main/groovy/org.grails.forge.internal.build.cli-module.gradle b/buildSrc/src/main/groovy/org.grails.forge.internal.build.cli-module.gradle
index 43aa15f..3fc382f 100644
--- a/buildSrc/src/main/groovy/org.grails.forge.internal.build.cli-module.gradle
+++ b/buildSrc/src/main/groovy/org.grails.forge.internal.build.cli-module.gradle
@@ -22,7 +22,6 @@ plugins {
     id "application"
     id "com.github.johnrengelman.shadow"
     id "org.grails.forge.rocker"
-    id "io.sdkman.vendors"
 }
 
 sourceSets {
diff --git a/grails-cli/build.gradle b/grails-cli/build.gradle
index b92d0e7..20ba757 100644
--- a/grails-cli/build.gradle
+++ b/grails-cli/build.gradle
@@ -20,6 +20,7 @@ plugins {
     id 'groovy'
     id 'distribution'
     id 'com.gradleup.shadow' version '8.3.6'
+    id "io.sdkman.vendors"
 }
 
 ext {
@@ -185,3 +186,18 @@ tasks.named('installDist').configure {
 tasks.named('distTar').configure {
     dependsOn cliStartScripts, forgeCliStartScripts, shellCliStartScripts, jarTask, shadowJarTask, rootProject.project(':grails-forge-cli').tasks.named('exploded')
 }
+
+sdkman {
+    api = "https://vendors.sdkman.io"
+    consumerKey = System.getenv("GVM_SDKVENDOR_KEY") ?: project.hasProperty("gvmSdkvendorKey") ? project.gvmSdkvendorKey : ''
+    consumerToken = System.getenv("GVM_SDKVENDOR_TOKEN") ?: project.hasProperty("gvmSdkvendorToken") ? project.gvmSdkvendorToken : ''
+    candidate = "grails"
+    version = project.version
+    hashtag = "#grailsfw"
+    platforms = [
+            "MAC_ARM64":"https://github.com/apache/grails-forge/releases/download/v${project.version}/grails-cli-v${project.version}.zip",
+            "MAC_OSX":"https://github.com/apache/grails-forge/releases/download/v${project.version}/grails-cli-v${project.version}.zip",
+            "WINDOWS_64":"https://github.com/apache/grails-forge/releases/download/v${project.version}/grails-cli-v${project.version}.zip",
+            "LINUX_64":"https://github.com/apache/grails-forge/releases/download/v${project.version}/grails-cli-v${project.version}.zip"
+    ]
+}
\ No newline at end of file
diff --git a/grails-forge-cli/build.gradle b/grails-forge-cli/build.gradle
index ca51aad..af502bc 100644
--- a/grails-forge-cli/build.gradle
+++ b/grails-forge-cli/build.gradle
@@ -103,21 +103,6 @@ startScripts {
     applicationName = 'grails-forge-cli'
 }
 
-sdkman {
-    api = "https://vendors.sdkman.io"
-    consumerKey = System.getenv("GVM_SDKVENDOR_KEY") ?: project.hasProperty("gvmSdkvendorKey") ? project.gvmSdkvendorKey : ''
-    consumerToken = System.getenv("GVM_SDKVENDOR_TOKEN") ?: project.hasProperty("gvmSdkvendorToken") ? project.gvmSdkvendorToken : ''
-    candidate = "grails"
-    version = project.version
-    hashtag = "#grailsfw"
-    platforms = [
-            "MAC_ARM64":"https://github.com/apache/grails-forge/releases/download/v${project.version}/grails-darwin-aarch64-v${project.version}.zip",
-            "MAC_OSX":"https://github.com/apache/grails-forge/releases/download/v${project.version}/grails-darwin-amd64-v${project.version}.zip",
-            "WINDOWS_64":"https://github.com/apache/grails-forge/releases/download/v${project.version}/grails-win-amd64-v${project.version}.zip",
-            "LINUX_64":"https://github.com/apache/grails-forge/releases/download/v${project.version}/grails-linux-amd64-v${project.version}.zip"
-    ]
-}
-
 apply {
     from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
     from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')