From 1b370d9a97fcb6165a43af9b181941ad2877c550 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Thu, 12 Dec 2024 19:24:26 -0500 Subject: [PATCH 1/5] Update profile build for 7.x Publish Plugin --- .github/workflows/gradle.yml | 5 +++-- .github/workflows/release.yml | 12 ++++++------ build.gradle | 3 +-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1b36b58..2f1d386 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -34,7 +34,8 @@ jobs: - name: Publish to repo.grails.org if: success() && github.event_name == 'push' && matrix.java == '17' env: - ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} + MAVEN_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + MAVEN_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} + MAVEN_PUBLISH_URL: 'https://repo.grails.org/grails/libs-snapshots-local' run: | ./gradlew publish diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4c04465..ac4d9bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,17 +37,17 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Publish to Sonatype OSSRH env: - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }} - SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + NEXUS_PUBLISH_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + NEXUS_PUBLISH_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + NEXUS_PUBLISH_URL: ${{ secrets.SONATYPE_NEXUS_URL }} + NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} - SECRING_FILE: ${{ secrets.SECRING_FILE }} + SECRING_FILE: "${{ github.workspace }}/secring.gpg" run: | echo $SECRING_FILE | base64 -d > secring.gpg echo "Publishing Artifacts" - (set -x; ./gradlew -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon) + (set -x; ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon) (set -x; ./gradlew assemble --no-daemon) - name: Export Gradle Properties uses: micronaut-projects/github-actions/export-gradle-properties@master diff --git a/build.gradle b/build.gradle index 3df8647..872c91f 100644 --- a/build.gradle +++ b/build.gradle @@ -12,14 +12,13 @@ buildscript { } apply plugin: "org.grails.grails-profile" -apply plugin: "org.grails.internal.grails-profile-publish" +apply plugin: "org.grails.grails-profile-publish" apply plugin: "io.spring.dependency-management" group 'org.grails.profiles' version project.projectVersion grailsPublish { - userOrg = 'grails' githubSlug = 'grails-profiles/angular' license = 'Apache-2.0' title = "Angular Profile" From d1862a69596376a6542ed7aa35a517a244a19af7 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Thu, 12 Dec 2024 19:50:21 -0500 Subject: [PATCH 2/5] Fix variable name --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac4d9bb..ba5ac9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,8 +44,9 @@ jobs: SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} SECRING_FILE: "${{ github.workspace }}/secring.gpg" + SECRING_FILE_VALUE: ${{ secrets.SECRING_FILE }} run: | - echo $SECRING_FILE | base64 -d > secring.gpg + echo $SECRING_FILE_VALUE | base64 -d > secring.gpg echo "Publishing Artifacts" (set -x; ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon) (set -x; ./gradlew assemble --no-daemon) From 04726e100835d7b5a964f8543e52c30c34a22975 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Thu, 12 Dec 2024 20:07:34 -0500 Subject: [PATCH 3/5] Restore signing keys --- .github/workflows/release.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba5ac9c..72f1168 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,12 +43,11 @@ jobs: NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} - SECRING_FILE: "${{ github.workspace }}/secring.gpg" - SECRING_FILE_VALUE: ${{ secrets.SECRING_FILE }} + SECRING_FILE: ${{ secrets.SECRING_FILE }} run: | - echo $SECRING_FILE_VALUE | base64 -d > secring.gpg + echo $SECRING_FILE | base64 -d > secring.gpg echo "Publishing Artifacts" - (set -x; ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon) + (set -x; ./gradlew -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon) (set -x; ./gradlew assemble --no-daemon) - name: Export Gradle Properties uses: micronaut-projects/github-actions/export-gradle-properties@master From e91cfff5589efd122a75d35ddf342a6eb8bdb60f Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Thu, 12 Dec 2024 21:03:23 -0500 Subject: [PATCH 4/5] Apply the publish plugin after a version is specified --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 872c91f..0b347c2 100644 --- a/build.gradle +++ b/build.gradle @@ -12,12 +12,12 @@ buildscript { } apply plugin: "org.grails.grails-profile" -apply plugin: "org.grails.grails-profile-publish" apply plugin: "io.spring.dependency-management" group 'org.grails.profiles' version project.projectVersion +apply plugin: "org.grails.grails-profile-publish" grailsPublish { githubSlug = 'grails-profiles/angular' license = 'Apache-2.0' From ac47adef47767e3b9f1b48d1a2dbc3e15dbea5c7 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Fri, 13 Dec 2024 13:57:52 -0500 Subject: [PATCH 5/5] move maven env variables above assemble step --- .github/workflows/gradle.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2f1d386..e21ab2e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -15,6 +15,9 @@ jobs: env: WORKSPACE: ${{ github.workspace }} GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8 + MAVEN_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + MAVEN_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} + MAVEN_PUBLISH_URL: 'https://repo.grails.org/grails/libs-snapshots-local' steps: - uses: actions/checkout@v2 - uses: actions/cache@v2 @@ -33,9 +36,5 @@ jobs: run: ./gradlew assemble - name: Publish to repo.grails.org if: success() && github.event_name == 'push' && matrix.java == '17' - env: - MAVEN_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - MAVEN_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - MAVEN_PUBLISH_URL: 'https://repo.grails.org/grails/libs-snapshots-local' run: | ./gradlew publish