Use environment variables to assign signatory details.

Layoric · Layoric · commit 46644cd8fb19 · 2023-10-12T12:12:16.000+11:00
diff --git a/.github/workflows/publish-android-maven-central.yml b/.github/workflows/publish-android-maven-central.yml
@@ -40,5 +40,7 @@ jobs:
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_KEY }}
         working-directory: ./src/AndroidClient
-        run: ./gradlew android:publishAllPublicationsToOSSRHRepository -Psigning.key=${{ secrets.OSSRH_GPG }}
+        run: ./gradlew android:publishAllPublicationsToOSSRHRepository
diff --git a/.github/workflows/publish-client-maven-central.yml b/.github/workflows/publish-client-maven-central.yml
@@ -40,5 +40,7 @@ jobs:
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_KEY }}
         working-directory: ./src/AndroidClient
-        run: ./gradlew client:publishAllPublicationsToOSSRHRepository -Psigning.key=${{ secrets.OSSRH_GPG }}
+        run: ./gradlew client:publishAllPublicationsToOSSRHRepository
diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle
@@ -118,12 +118,13 @@ publishing {
 
 
 
-if (project.hasProperty('signing.key')) {
+if (findProperty('signingKeyId')) {
     println "Signing enabled"
     signing {
+        def signingKeyId = findProperty("signingKeyId")
+        def signingKey = findProperty("signingKey")
+        useInMemoryPgpKeys(signingKeyId, signingKey, null)
         sign publishing.publications.mavenJava
-        useInMemoryPgpKeys(findProperty("signing.key") as String, null)
-        //useGpgCmd(findProperty("signing.secretKeyRingFile"))
     }
 } else {
     println "Signing disabled"
diff --git a/src/AndroidClient/client/build.gradle b/src/AndroidClient/client/build.gradle
@@ -104,12 +104,13 @@ publishing {
     }
 }
 
-if (project.hasProperty('signing.key')) {
+if (findProperty('signingKeyId')) {
     println "Signing enabled"
     signing {
+        def signingKeyId = findProperty("signingKeyId")
+        def signingKey = findProperty("signingKey")
+        useInMemoryPgpKeys(signingKeyId, signingKey, null)
         sign publishing.publications.mavenJava
-        useInMemoryPgpKeys(findProperty("signing.key") as String, null)
-        //useGpgCmd(findProperty("signing.secretKeyRingFile"))
     }
 } else {
     println "Signing disabled"

Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,13 @@ publishing {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`-if (project.hasProperty('signing.key')) {`
	`107`	`+if (findProperty('signingKeyId')) {`
`108`	`108`	`println "Signing enabled"`
`109`	`109`	`signing {`
	`110`	`+ def signingKeyId = findProperty("signingKeyId")`
	`111`	`+ def signingKey = findProperty("signingKey")`
	`112`	`+ useInMemoryPgpKeys(signingKeyId, signingKey, null)`
`110`	`113`	`sign publishing.publications.mavenJava`
`111`		`- useInMemoryPgpKeys(findProperty("signing.key") as String, null)`
`112`		`- //useGpgCmd(findProperty("signing.secretKeyRingFile"))`
`113`	`114`	`}`
`114`	`115`	`} else {`
`115`	`116`	`println "Signing disabled"`