try env var for maven publishing config

bufbuild · Jun 3, 2022 · e9a2e29 · e9a2e29
1 parent a7c67f2
commit e9a2e29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -33,13 +33,16 @@ jobs:
         with:
           arguments: |
             publish
+            closeAndReleaseRepository
             publishPlugins
             -Dorg.gradle.internal.http.socketTimeout=120000
             -Dorg.gradle.internal.network.retry.max.attempts=1
             -Dorg.gradle.internal.publish.checksums.insecure=true
+            --no-daemon
+            --no-parallel
         env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}
           PGP_KEY: ${{ secrets.PGP_KEY }}
           PGP_PASSWORD: ${{ secrets.PGP_PASSWORD }}
           GRADLE_PORTAL_PUBLISH_KEY: ${{ secrets.GRADLE_PORTAL_PUBLISH_KEY }}

diff --git a/buildSrc/src/main/kotlin/ConfigurePublishing.kt b/buildSrc/src/main/kotlin/ConfigurePublishing.kt
@@ -19,11 +19,9 @@ import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.SonatypeHost
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.the
-import org.gradle.kotlin.dsl.withType
 import org.gradle.plugins.signing.SigningExtension
 
 object ProjectInfo {
@@ -36,9 +34,6 @@ fun Project.configurePublishing() {
     apply(plugin = "com.vanniktech.maven.publish.base")
 
     if (isRelease()) {
-        setProperty("mavenCentralUsername", System.getenv("OSSRH_USERNAME"))
-        setProperty("mavenCentralPassword", System.getenv("OSSRH_PASSWORD"))
-
         apply(plugin = "signing")
 
         configure<SigningExtension> {
@@ -47,14 +42,10 @@ fun Project.configurePublishing() {
                 System.getenv("PGP_PASSWORD")
             )
 
-            the<PublishingExtension>().publications.withType<MavenPublication> {
-                sign(this)
-            }
+            sign(the<PublishingExtension>().publications)
         }
     }
 
-    println("signing key length: " + properties["signingInMemoryKey"]?.toString()?.length)
-
     configure<MavenPublishBaseExtension> {
         configure(KotlinJvm(JavadocJar.Empty()))
         publishToMavenCentral(SonatypeHost.DEFAULT)

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1 @@
 org.gradle.jvmargs=-Xmx1024m
-signingInMemoryKey=placeholder
-signingInMemoryPassword=placeholder
-mavenCentralUsername=placeholder
-mavenCentralPassword=placeholder