fix: release staging repository with publication (#357)

Due to gradle-nexus/publish-plugin#96 the call to release staging repository needs to be made together with the publication task.
eclipse-zenoh · Jan 21, 2025 · 9b22938 · 9b22938
1 parent ab482d9
commit 9b22938
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml
@@ -83,23 +83,14 @@ jobs:
         run: |
           if [[ "${{ inputs.snapshot }}" == "true" ]]; then
             echo "PUB_MODE=-PSNAPSHOT" >> $GITHUB_ENV
+          else
+            echo "RELEASE=closeAndReleaseSonatypeStagingRepository"
           fi
 
       - if: ${{ inputs.maven_publish == true }}
         name: Gradle Publish Android Package to Maven Central repository
         run: |
-          ./gradlew publishAndroidReleasePublicationToSonatypeRepository -PremotePublication=true -Pandroid=true ${{ env.PUB_MODE }}
-        env:
-          ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
-          ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
-          ORG_GPG_KEY_ID: ${{ secrets.ORG_GPG_KEY_ID }}
-          ORG_GPG_SUBKEY_ID: ${{ secrets.ORG_GPG_SUBKEY_ID }}
-          ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
-          ORG_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }}
-
-      - if: ${{ inputs.maven_publish == true && inputs.snapshot == false }}
-        name: Close & Release Staging Repository
-        run: ./gradlew closeAndReleaseSonatypeStagingRepository -Pandroid=true
+          ./gradlew publishAndroidReleasePublicationToSonatypeRepository ${{ env.RELEASE }} -PremotePublication=true -Pandroid=true ${{ env.PUB_MODE }}
         env:
           ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
           ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
@@ -110,7 +101,7 @@ jobs:
 
       - if: ${{ inputs.github_publish == true }}
         name: Gradle Publish Android Package to GitHub packages repository
-        run: ./gradlew publishAndroidReleasePublicationToGithubPackagesRepository -PremotePublication=true -Pandroid=true ${{ env.PUB_MODE }}
+        run: ./gradlew publishAndroidReleasePublicationToGithubPackagesRepository ${{ env.RELEASE }} -PremotePublication=true -Pandroid=true ${{ env.PUB_MODE }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ORG_GPG_KEY_ID: ${{ secrets.ORG_GPG_KEY_ID }}

diff --git a/.github/workflows/publish-jvm.yml b/.github/workflows/publish-jvm.yml
@@ -188,23 +188,14 @@ jobs:
         run: |
           if [[ "${{ inputs.snapshot }}" == "true" ]]; then
             echo "PUB_MODE=-PSNAPSHOT" >> $GITHUB_ENV
+          else 
+            echo "RELEASE=closeAndReleaseSonatypeStagingRepository"
           fi
 
       - if: ${{ inputs.maven_publish == true }}
         name: Gradle Publish JVM Package to Maven Central repository
         run: |
-          ./gradlew publishJvmPublicationToSonatypeRepository -PremotePublication=true ${{ env.PUB_MODE }}
-        env:
-          ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
-          ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
-          ORG_GPG_KEY_ID: ${{ secrets.ORG_GPG_KEY_ID }}
-          ORG_GPG_SUBKEY_ID: ${{ secrets.ORG_GPG_SUBKEY_ID }}
-          ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
-          ORG_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }}
-
-      - if: ${{ inputs.maven_publish == true && inputs.snapshot == false }}
-        name: Close & Release Staging Repository
-        run: ./gradlew closeAndReleaseSonatypeStagingRepository
+          ./gradlew publishJvmPublicationToSonatypeRepository ${{ env.RELEASE }} -PremotePublication=true ${{ env.PUB_MODE }}
         env:
           ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
           ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
@@ -215,7 +206,7 @@ jobs:
 
       - if: ${{ inputs.github_publish == true }}
         name: Gradle Publish JVM Package to GitHub packages repository
-        run: ./gradlew publishJvmPublicationToGithubPackagesRepository -PremotePublication=true ${{ env.PUB_MODE }}
+        run: ./gradlew publishJvmPublicationToGithubPackagesRepository ${{ env.RELEASE }} -PremotePublication=true ${{ env.PUB_MODE }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ORG_GPG_KEY_ID: ${{ secrets.ORG_GPG_KEY_ID }}