move signing into sub project

hndrs · Feb 16, 2021 · 7793fff · 7793fff
1 parent 4017844
commit 7793fff
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/hndrs-gradle-publish.yml b/.github/workflows/hndrs-gradle-publish.yml
@@ -5,6 +5,8 @@ on:
   push:
     tags:
       - v*
+    branches:
+      - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -131,15 +131,6 @@ subprojects {
                     }
                 }
             }
-
-            val signingKey: String? = System.getenv("SIGNING_KEY")
-            val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
-            if (signingKey != null && signingPassword != null) {
-                signing {
-                    useInMemoryPgpKeys(groovy.json.StringEscapeUtils.unescapeJava(signingKey), signingPassword)
-                    sign(publications[project.name])
-                }
-            }
         }
     }
 

diff --git a/spring-json-api-starter/build.gradle.kts b/spring-json-api-starter/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
 publishingInfo {
     description = "SpringBoot json api response starter"
 }
-publishing{
+publishing {
     val sourcesJarSubProject by tasks.creating(Jar::class) {
         dependsOn("classes")
         archiveClassifier.set("sources")
@@ -28,5 +28,13 @@ publishing{
 
             }
         }
+        val signingKey: String? = System.getenv("SIGNING_KEY")
+        val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
+        if (signingKey != null && signingPassword != null) {
+            signing {
+                useInMemoryPgpKeys(groovy.json.StringEscapeUtils.unescapeJava(signingKey), signingPassword)
+                sign(publications[project.name])
+            }
+        }
     }
 }
diff --git a/spring-json-api/build.gradle.kts b/spring-json-api/build.gradle.kts
@@ -13,8 +13,9 @@ publishing{
         archiveClassifier.set("sources")
         from(sourceSets["main"].allSource)
     }
-    
+
     publications {
+        println("Pub ${project.name}")
         create<MavenPublication>(project.name) {
             from(components["java"])
             artifact(sourcesJarSubProject)
@@ -26,5 +27,13 @@ publishing{
 
             }
         }
+        val signingKey: String? = System.getenv("SIGNING_KEY")
+        val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
+        if (signingKey != null && signingPassword != null) {
+            signing {
+                useInMemoryPgpKeys(groovy.json.StringEscapeUtils.unescapeJava(signingKey), signingPassword)
+                sign(publications[project.name])
+            }
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ on: @@
       push:
         tags:
           - v*
+        branches:
+          - main
       # Allows you to run this workflow manually from the Actions tab
       workflow_dispatch:
@@ Expand Down @@