Optimizing gh actions and build.gradle

gpc · Sep 17, 2024 · 5b0f491 · 5b0f491
1 parent ff335fa
commit 5b0f491
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/github-pages.yml → .github/github-pages.yml b/.github/workflows/github-pages.yml → .github/github-pages.yml
@@ -36,7 +36,7 @@ jobs:
                 env:
                     RELEASE_VERSION: ${{ steps.get_version.outputs.version-without-v }}
                 with:
-                    arguments: -Pversion=${RELEASE_VERSION} :docs:asciidoctor
+                    arguments: -Pversion=${RELEASE_VERSION} asciidoctor
             -   uses: actions/configure-pages@v4
             -   uses: actions/upload-pages-artifact@v3
                 with:

diff --git a/.github/workflows/gradle-check.yml → .github/workflows/build.yml b/.github/workflows/gradle-check.yml → .github/workflows/build.yml
@@ -18,10 +18,11 @@ jobs:
                 with:
                     distribution: temurin
                     java-version: 11
-            -   uses: gradle/gradle-build-action@v2
+            -   name: Setup Gradle
+                uses: gradle/actions/setup-gradle@v4
+            -   name: Build and publish snapshot
                 env:
                     SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
                     SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
                     SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
-                with:
-                    arguments: publish
+                run: ./gradlew publish
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,6 +42,8 @@ jobs:
             -   uses: micronaut-projects/github-actions/pre-release@master
                 with:
                     token: ${{ secrets.GITHUB_TOKEN }}
+            -   name: Setup Gradle
+                uses: gradle/actions/setup-gradle@v4        
             -   name: Publish to Sonatype OSSRH
                 if: ${{ env.ACT }} # prevent deploy using gh act
                 env:
@@ -69,6 +71,8 @@ jobs:
                 with:
                     java-version: 11
                     distribution: temurin
+            -   name: Setup Gradle
+                uses: gradle/actions/setup-gradle@v4
             -   name: Set version in gradle.properties
                 run: |
                     echo "Preparing next snapshot as ${NEXT_VERSION}"
@@ -97,9 +101,10 @@ jobs:
                     distribution: temurin
             -   uses: micronaut-projects/github-actions/export-gradle-properties@master
                 id: asciidoctor
-            -   uses: gradle/gradle-build-action@v2
-                with:
-                    arguments: -Pversion="${{ env.RELEASE_VERSION }}" asciidoctor
+            -   name: Setup Gradle
+                uses: gradle/actions/setup-gradle@v4
+            -   name: Build documentation
+                run: ./gradlew -Pversion="${{ env.RELEASE_VERSION }}" asciidoctor
             -   uses: micronaut-projects/github-pages-deploy-action@master
                 if: success()
                 env:

diff --git a/build.gradle b/build.gradle
@@ -65,7 +65,7 @@ publishing {
     publications {
         maven(MavenPublication) {
             groupId = project.group
-            artifactId = 'release-demo'
+            artifactId = project.name
             version = project.version
 
             from components.java

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -5,4 +5,6 @@ repositories {
 dependencies {
     implementation("org.grails:grails-gradle-plugin:6.1.2")
     implementation("org.grails.plugins:hibernate5:8.1.0")
+    implementation 'org.grails:grails-shell:6.1.2'
+
 }