Try to wire signing into publishing.

ServiceStack · Oct 11, 2023 · f7181a7 · f7181a7
1 parent f657cf5
commit f7181a7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/.github/workflows/publish-android-maven-central.yml b/.github/workflows/publish-android-maven-central.yml
@@ -21,7 +21,7 @@ jobs:
         run: |
           echo "${{ secrets.OSSRH_GPG }}" > private-key.asc
           gpg --import --batch private-key.asc
-          echo "SIGNING_SECRET_KEY_RING_FILE=$(pwd)/private-key.asc" >> $GITHUB_ENV
+          echo "SIGNING_KEY=`cat $(pwd)/private-key.asc`" >> $GITHUB_ENV
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
@@ -41,6 +41,5 @@ jobs:
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           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.key=${{ env.SIGNING_KEY }}
diff --git a/.github/workflows/publish-client-maven-central.yml b/.github/workflows/publish-client-maven-central.yml
@@ -21,7 +21,7 @@ jobs:
         run: |
           echo "${{ secrets.OSSRH_GPG }}" > private-key.asc
           gpg --import --batch private-key.asc
-          echo "SIGNING_SECRET_KEY_RING_FILE=$(pwd)/private-key.asc" >> $GITHUB_ENV
+          echo "SIGNING_KEY=`cat $(pwd)/private-key.asc`" >> $GITHUB_ENV
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
@@ -41,6 +41,5 @@ jobs:
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           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.key=${{ env.SIGNING_KEY }}
diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle
@@ -117,11 +117,13 @@ publishing {
 }
 
 
-if (project.hasProperty('signing.keyId')) {
+
+if (project.hasProperty('signing.key')) {
     println "Signing enabled"
     signing {
         sign publishing.publications.mavenJava
-        useInMemoryPgpKeys(findProperty("signing.keyId") as String, null)
+        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
@@ -18,15 +18,20 @@ dependencies {
     testImplementation 'pl.pragmatists:JUnitParams:1.1.1'
 }
 
-// Additional tasks for generating source and Javadoc JARs
-task sourcesJar(type: Jar) {
+task sourceJar(type: Jar) {
+    classifier "sources"
     from sourceSets.main.allJava
-    archiveClassifier.set('sources')
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier "javadoc"
     from javadoc.destinationDir
-    archiveClassifier.set('javadoc')
+}
+
+artifacts {
+    archives jar
+    archives sourceJar
+    archives javadocJar
 }
 
 // Configure the publishing block for Maven Central deployment
@@ -36,8 +41,12 @@ publishing {
             from components.java
 
             // Attach source and javadoc JARs
-            artifact sourcesJar
-            artifact javadocJar
+            artifact(sourceJar) {
+                classifier = 'sources'
+            }
+            artifact(javadocJar) {
+                classifier = 'javadoc'
+            }
 
             pom {
                 name = 'ServiceStack.Client'
@@ -95,11 +104,11 @@ publishing {
     }
 }
 
-if (project.hasProperty('signing.keyId')) {
+if (project.hasProperty('signing.key')) {
     println "Signing enabled"
     signing {
         sign publishing.publications.mavenJava
-        useInMemoryPgpKeys(findProperty("signing.keyId") as String, null)
+        useInMemoryPgpKeys(findProperty("signing.key") as String, null)
         //useGpgCmd(findProperty("signing.secretKeyRingFile"))
     }
 } else {