Try to wire signing into publishing.

ServiceStack · Oct 11, 2023 · adb4482 · adb4482
1 parent 24885f2
commit adb4482
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/publish-android-maven-central.yml b/.github/workflows/publish-android-maven-central.yml
@@ -43,4 +43,4 @@ jobs:
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
         working-directory: ./src/AndroidClient
-        run: ./gradlew android:publishAllPublicationsToOSSRHRepository -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} -Psigning.secretKeyRingFile=${{ env.SIGNING_SECRET_KEY_RING_FILE }}
+        run: ./gradlew android:publishAllPublicationsToOSSRHRepository -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} -Psigning.secretKeyRingFile=${{ env.SIGNING_SECRET_KEY_RING_FILE }} -Psigning.password=
diff --git a/.github/workflows/publish-client-maven-central.yml b/.github/workflows/publish-client-maven-central.yml
@@ -43,4 +43,4 @@ jobs:
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
         working-directory: ./src/AndroidClient
-        run: ./gradlew client:publishAllPublicationsToOSSRHRepository -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} -Psigning.secretKeyRingFile=${{ env.SIGNING_SECRET_KEY_RING_FILE }}
+        run: ./gradlew client:publishAllPublicationsToOSSRHRepository -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} -Psigning.secretKeyRingFile=${{ env.SIGNING_SECRET_KEY_RING_FILE }} -Psigning.password=
diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle
@@ -121,6 +121,7 @@ if (project.hasProperty('signing.keyId')) {
     println "Signing enabled"
     signing {
         sign publishing.publications.mavenJava
+        useInMemoryPgpKeys(findProperty("signing.keyId") as String, findProperty("signing.password") as String)
     }
 } else {
     println "Signing disabled"

diff --git a/src/AndroidClient/client/build.gradle b/src/AndroidClient/client/build.gradle
@@ -99,6 +99,9 @@ if (project.hasProperty('signing.keyId')) {
     println "Signing enabled"
     signing {
         sign publishing.publications.mavenJava
+        useInMemoryPgpKeys(findProperty("signing.keyId") as String, findProperty("signing.password") as String)
+
+        // useGpgCmd(findProperty("signing.secretKeyRingFile"))
     }
 } else {
     println "Signing disabled"