fix(build): using env for importing gpg

littlehorse-enterprises · Jan 10, 2025 · b292e62 · b292e62
1 parent 0a2520a
commit b292e62
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -46,25 +46,14 @@ jobs:
           TAG: ${{ needs.prepare.outputs.tag }}
         run: sed -i "s/version=.*/version=${TAG}/g" gradle.properties
 
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
-
-      - name: List keys
-        run: gpg -K
-
-      - name: Generate KeyRing
-        run: |
-          gpg --keyring secring.gpg --export-secret-keys --passphrase ${{ secrets.GPG_PASSPHRASE }} --batch --yes --pinentry-mode=loopback > ~/.gnupg/secring.gpg
-          ls ~/.gnupg/
-
       - name: Tests
         run: ./gradlew sdk-java:test test-utils:test test-utils-container:test
 
       - name: Publish
-        run: ./gradlew sdk-java:publish test-utils:publish test-utils-container:publish -Psigning.secretKeyRingFile=/home/runner/.gnupg/secring.gpg -Psigning.password=${{ secrets.GPG_PASSPHRASE }} -Psigning.keyId=${{ vars.GPG_KEY_ID }} -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }}
+        env:
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
+        run: ./gradlew sdk-java:publish test-utils:publish test-utils-container:publish -PossrhUsername=${{ secrets.OSSRH_USERNAME }} -PossrhPassword=${{ secrets.OSSRH_PASSWORD }}
 
       - name: Information
         run: echo "::warning title=Do not forget to release the java package at Maven Central::Login at https://s01.oss.sonatype.org/"

diff --git a/sdk-java/build.gradle b/sdk-java/build.gradle
@@ -67,6 +67,11 @@ publishing {
 
 signing {
     required { gradle.taskGraph.hasTask("publish") }
+
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+
     sign publishing.publications.mavenJava
 }
 

diff --git a/test-utils-container/build.gradle b/test-utils-container/build.gradle
@@ -108,6 +108,11 @@ publishing {
 
 signing {
     required { gradle.taskGraph.hasTask("publish") }
+
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+
     sign publishing.publications.mavenJava
 }
 

diff --git a/test-utils/build.gradle b/test-utils/build.gradle
@@ -103,6 +103,11 @@ publishing {
 
 signing {
     required { gradle.taskGraph.hasTask("publish") }
+
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+
     sign publishing.publications.mavenJava
 }