Switch to inMemoryPgpKeys

BierDav · Jun 17, 2022 · f566759 · f566759
1 parent 170736b
commit f566759
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -18,13 +18,13 @@ jobs:
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-          gpg-passphrase: ${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}
       - name: Publish artifact
-        run: ./gradlew publish -Psigning.gnupg.keyName=${{secrets.OSSRH_GPG_SECRET_KEY_ID}} -Psigning.gnupg.passphrase=${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}} -Psigning.gnupg.optionsFile=${GITHUB_WORKSPACE}/gpg.conf
+        run: ./gradlew publish
         env:
           MAVEN_USERNAME: ${{secrets.OSSRH_USERNAME}}
           MAVEN_PASSWORD: ${{secrets.OSSRH_TOKEN}}
+          GPG_PRIVATE_KEY: ${{secrets.OSSRH_GPG_SECRET_KEY}}
+          GPG_PRIVATE_KEY_PASSWORD: ${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}
       - name: Setup upterm session
         if: always()
         uses: lhotari/action-upterm@v1

diff --git a/buildSrc/src/main/kotlin/maven-publish-script.gradle.kts b/buildSrc/src/main/kotlin/maven-publish-script.gradle.kts
@@ -11,7 +11,14 @@ plugins {
 }
 
 signing {
-    useGpgCmd()
+    val privateKey = System.getenv("GPG_PRIVATE_KEY")
+    val privateKeyPassword = System.getenv("GPG_PRIVATE_KEY_PASSWORD")
+
+    if (privateKey != null && privateKeyPassword != null)
+        useInMemoryPgpKeys(privateKey, privateKeyPassword)
+    else
+        useGpgCmd()
+
     sign(publishing.publications)
 }