Update signing in gradle files

Signed-off-by: Jade Carino <[email protected]>
galasa-dev · Jul 15, 2024 · b390b22 · b390b22
1 parent 4c1f247
commit b390b22
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/galasa-extensions-parent/build.gradle b/galasa-extensions-parent/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'biz.aQute.bnd.builder' version '5.3.0' apply false
     id 'dev.galasa.githash' version '0.15.0' apply false
     id 'maven-publish'
-    // id 'signing'
+    id 'signing'
 }
 
 version = '0.15.0'
@@ -14,13 +14,13 @@ task clean {
    }
 }
 
-// signing {
-//     def signingKeyId = findProperty("signingKeyId")
-//     def signingKey = findProperty("signingKey")
-//     def signingPassword = findProperty("signingPassword")
-//     useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-//     sign publishing.publications
-// }
+signing {
+    def signingKeyId = findProperty("signingKeyId")
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+    sign publishing.publications
+}
 
 //---------------------------------------------------------------
 // We need to gather the release and packaging metadata from each
@@ -208,10 +208,8 @@ publishing {
 
             if ("$targetMaven".startsWith('http')) {
                 credentials {
-                    username System.getenv('MAVENUSERNAME')
-                    password System.getenv('MAVENPASSWORD')
-                    // username System.getenv('GITHUB_ACTOR')
-                    // password System.getenv('GITHUB_TOKEN')
+                    username System.getenv('GITHUB_ACTOR')
+                    password System.getenv('GITHUB_TOKEN')
                 }
             }
         }

diff --git a/galasa-extensions-parent/buildSrc/src/main/groovy/galasa.java.gradle b/galasa-extensions-parent/buildSrc/src/main/groovy/galasa.java.gradle
@@ -59,10 +59,10 @@ repositories {
 }
 
 signing {
-    // def signingKeyId = findProperty("signingKeyId")
-    // def signingKey = findProperty("signingKey")
-    // def signingPassword = findProperty("signingPassword")
-    // useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+    def signingKeyId = findProperty("signingKeyId")
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     sign publishing.publications
 }
 
@@ -111,10 +111,8 @@ publishing {
 
             if ("$targetMaven".startsWith('http')) {
                 credentials {
-                    username System.getenv('MAVENUSERNAME')
-                    password System.getenv('MAVENPASSWORD')
-                    // username System.getenv('GITHUB_ACTOR')
-                    // password System.getenv('GITHUB_TOKEN')
+                    username System.getenv('GITHUB_ACTOR')
+                    password System.getenv('GITHUB_TOKEN')
                 }
             }
         }