[publish] fix shadow jar publication

FrogDevelopment · May 16, 2024 · 58285c3 · 58285c3
1 parent 19d9875
commit 58285c3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 41 deletions.
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -6,8 +6,8 @@ env:
 on:
   push:
     branches: [ "**" ]
-  pull_request:
-    branches: [ "develop" ]
+  release:
+    types: [ created ]
 
 jobs:
   build:
@@ -49,6 +49,8 @@ jobs:
       - name: Publish package
         run: ./gradlew publish
         env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GNUPG_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GNUPG_PASSPHRASE }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/buildSrc/src/main/kotlin/com.frogdevelopment.publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.frogdevelopment.publish-conventions.gradle.kts
@@ -89,10 +89,9 @@ signing {
 }
 
 tasks {
-    matching { it is PublishToMavenRepository && it.repository.name == "sonatype" }.all {
-        onlyIf { releaseVersion }
-    }
-    matching { it is PublishToMavenRepository && it.repository.name == "github" }.all {
-        onlyIf { !releaseVersion }
+    withType<PublishToMavenRepository>().configureEach {
+        onlyIf {
+            (releaseVersion && repository.name == "sonatype") || (!releaseVersion && repository.name == "github")
+        }
     }
 }
diff --git a/consul-populate-cli/build.gradle.kts b/consul-populate-cli/build.gradle.kts
@@ -57,12 +57,11 @@ tasks {
     jar {
         enabled = false
     }
+
     shadowJar {
 //        minimize() waiting https://github.com/johnrengelman/shadow/pull/876
-        archiveClassifier.set("")
     }
 
-
     test {
         // https://github.com/stefanbirkner/system-lambda/issues/27
         systemProperty("java.security.manager", "allow")