Update signing

MohamedRejeb · Sep 7, 2023 · a213d50 · a213d50
1 parent 27e0c89
commit a213d50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -44,11 +44,6 @@ jobs:
           path: |
             ~/.konan
           key: ${{ runner.os }}-${{ hashFiles('**/.lock') }}
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v5
-        with:
-          gpg_private_key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-          passphrase: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
@@ -60,10 +55,6 @@ jobs:
           arguments: |
             ${{ matrix.target }}
             closeAndReleaseSonatypeStagingRepository
-            -Psigning.gnupg.passphrase='${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}'
-            -Psigning.gnupg.keyName='${{secrets.OSSRH_GPG_SECRET_KEY_ID}}'
-            -PsonatypeUsername='${{secrets.OSSRH_USERNAME}}'
-            -PsonatypePassword='${{secrets.OSSRH_PASSWORD}}'
         env:
           OSSRH_STAGING_PROFILE_ID: ${{ secrets.OSSRH_STAGING_PROFILE_ID }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}

diff --git a/convention-plugins/src/main/kotlin/module.publication.gradle.kts b/convention-plugins/src/main/kotlin/module.publication.gradle.kts
@@ -48,22 +48,15 @@ publishing {
 }
 
 signing {
-    if (project.hasProperty("signing.gnupg.keyName")) {
-        useGpgCmd()
-        sign(publishing.publications)
-    }
+    useInMemoryPgpKeys(
+        System.getenv("OSSRH_GPG_SECRET_KEY_ID"),
+        System.getenv("OSSRH_GPG_SECRET_KEY"),
+        System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD"),
+    )
+    sign(publishing.publications)
 }
 
-//signing {
-//    useInMemoryPgpKeys(
-//        System.getenv("OSSRH_GPG_SECRET_KEY_ID"),
-//        System.getenv("OSSRH_GPG_SECRET_KEY"),
-//        System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD"),
-//    )
-//    sign(publishing.publications)
-//}
-//
-//// TODO: remove after https://youtrack.jetbrains.com/issue/KT-46466 is fixed
-//project.tasks.withType(AbstractPublishToMaven::class.java).configureEach {
-//    dependsOn(project.tasks.withType(Sign::class.java))
-//}
+// TODO: remove after https://youtrack.jetbrains.com/issue/KT-46466 is fixed
+project.tasks.withType(AbstractPublishToMaven::class.java).configureEach {
+    dependsOn(project.tasks.withType(Sign::class.java))
+}