Use environment variables to assign signatory details.

ServiceStack · Oct 12, 2023 · 2925689 · 2925689
1 parent 46644cd
commit 2925689
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/publish-android-maven-central.yml b/.github/workflows/publish-android-maven-central.yml
@@ -40,7 +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 }}
+ SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+ SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
  working-directory: ./src/AndroidClient
  run: ./gradlew android:publishAllPublicationsToOSSRHRepository
diff --git a/.github/workflows/publish-client-maven-central.yml b/.github/workflows/publish-client-maven-central.yml
@@ -40,7 +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 }}
+ SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+ SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
  working-directory: ./src/AndroidClient
  run: ./gradlew client:publishAllPublicationsToOSSRHRepository
diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle
@@ -116,14 +116,15 @@ publishing {
  }
 }
 
+// Check if the environment variables are set
+def signingKey = System.getenv('SIGNING_KEY')
+def signingPassword = System.getenv('SIGNING_PASSWORD')
 
-
-if (findProperty('signingKeyId')) {
+// Conditionally apply the signing plugin and configuration
+if (signingKey && signingPassword) {
  println "Signing enabled"
  signing {
- def signingKeyId = findProperty("signingKeyId")
- def signingKey = findProperty("signingKey")
- useInMemoryPgpKeys(signingKeyId, signingKey, null)
+ useInMemoryPgpKeys(signingKey, signingPassword)
  sign publishing.publications.mavenJava
  }
 } else {

diff --git a/src/AndroidClient/client/build.gradle b/src/AndroidClient/client/build.gradle
@@ -104,12 +104,15 @@ publishing {
  }
 }
 
-if (findProperty('signingKeyId')) {
+// Check if the environment variables are set
+def signingKey = System.getenv('SIGNING_KEY')
+def signingPassword = System.getenv('SIGNING_PASSWORD')
+
+// Conditionally apply the signing plugin and configuration
+if (signingKey && signingPassword) {
  println "Signing enabled"
  signing {
- def signingKeyId = findProperty("signingKeyId")
- def signingKey = findProperty("signingKey")
- useInMemoryPgpKeys(signingKeyId, signingKey, null)
+ useInMemoryPgpKeys(signingKey, signingPassword)
  sign publishing.publications.mavenJava
  }
 } else {