update

nervosnetwork · Feb 5, 2025 · a994eb9 · a994eb9
1 parent d08cdbc
commit a994eb9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -34,7 +34,12 @@ jobs:
         with:
           java-version: 1.8
       - name: Prepare signing secret key ring file
-        run: echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg
+        run: |
+          echo "${{ secrets.NEXUS_SIGNING_SECRET_KEY_BASE64 }}" | base64 --decode > /tmp/secret_key.gpg
+          printf "signing.keyId=%s\n" "${{ secrets.NEXUS_SIGNING_KEYID }}" >> gradle.properties
+          printf "signing.secretKeyRingFile=%s\n" /tmp/secret_key.gpg >> gradle.properties
+          printf "signing.password=%s\n" ${{ secrets.NEXUS_SIGNING_PASSWORD }} >> gradle.properties
+        
       - name: Build project
         run: |
           chmod +x ./gradlew
@@ -44,9 +49,9 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.NEXUS_OSSRH_USERNAME }}
           ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.NEXUS_OSSRH_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: "/tmp/secret_key.gpg"
+          # ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.NEXUS_SIGNING_KEYID }}
+          # ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.NEXUS_SIGNING_PASSWORD }}
+          # ORG_GRADLE_PROJECT_signingKey: "/tmp/secret_key.gpg"
         run: |
           ./gradlew uploadArchives
 

diff --git a/build.gradle b/build.gradle
@@ -94,6 +94,10 @@ configure(subprojects.findAll { it.name != 'tests' }) {
     ext {
         ossrhUsername = project.hasProperty('ossrhUsername') ? project.property('ossrhUsername') : ''
         ossrhPassword = project.hasProperty('ossrhPassword') ? project.property('ossrhPassword') : ''
+		// signingKeyId
+		signingKeyId = project.hasProperty('signingKeyId') ? project.property('signingKeyId') : ''
+		signingPassword = project.hasProperty('signingPassword') ? project.property('signingPassword') : ''
+		signingKey = project.hasProperty('signingKey') ? project.property('signingKey') : ''
     }
 
 
@@ -144,18 +148,7 @@ configure(subprojects.findAll { it.name != 'tests' }) {
 	}
 
 	signing {
-		// useInMemoryPgpKeys(
-		// 	signingKeyId
-		// 	file(signingKeyId).getText(),
-		// 	signingPassword as String
-		// )
-		// sign publishing.publications.mavenJava
-		def signingKeyId = findProperty("signingKeyId")
-		def signingKey = findProperty("signingKey")
-		def signingPassword = findProperty("signingPassword")
-		useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
 		sign publishing.publications
-
 	}