Close #37 - Fix multiple GitHub Release issue

kevin-lee · Dec 8, 2019 · 89f900c · 89f900c
1 parent 90011fd
commit 89f900c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 40 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,20 +12,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: sbt GitHub Release core
+    - name: sbt GitHub Release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_AUTH_TOKEN }}
       run: |
         echo "Run] sbt GitHub release"
-        echo 'sbt -J-Xmx2048m "; project core; clean; +test; +packagedArtifacts; gitHubRelease"'
-        sbt -J-Xmx2048m "; project core; clean; +test; +packagedArtifacts; gitHubRelease"
-    - name: sbt GitHub Release cli
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_AUTH_TOKEN }}
-      run: |
-        echo "Run] sbt GitHub release cli"
-        echo 'sbt -J-Xmx2048m "; project cli; ++2.13.1!; clean; universal:packageBin; universal:packageZipTarball; debian:packageBin; gitHubRelease"'
-        sbt -J-Xmx2048m "; project cli; ++2.13.1!; clean; universal:packageBin; universal:packageZipTarball; debian:packageBin; gitHubRelease"
+        echo 'sbt -J-Xmx2048m "; project core; clean; +test; +packagedArtifacts"'
+        sbt -J-Xmx2048m "; project core; clean; +test; +packagedArtifacts"
+        echo 'sbt -J-Xmx2048m "; project cli; ++2.13.1!; clean; universal:packageBin; universal:packageZipTarball; debian:packageBin"'
+        sbt -J-Xmx2048m "; project cli; ++2.13.1!; clean; universal:packageBin; universal:packageZipTarball; debian:packageBin"
+        echo 'sbt -J-Xmx2048m "; gitHubRelease"'
+        sbt -J-Xmx2048m "; gitHubRelease"
     - name: sbt Publish core
       env:
         BINTRAY_USER: ${{ secrets.BINTRAY_USER }}

diff --git a/build.sbt b/build.sbt
@@ -34,7 +34,6 @@ lazy val  hedgehogLibs: Seq[ModuleID] = Seq(
 
 lazy val core = (project in file("core"))
   .enablePlugins(BuildInfoPlugin)
-  .enablePlugins(DevOopsGitReleasePlugin)
   .settings(
       name := s"$ProjectNamePrefix-core"
     , crossScalaVersions := CrossScalaVersions
@@ -65,38 +64,39 @@ lazy val pirateVersion = "65e747146a29e82dea882e4e6fece9bcc0f1658c"
 lazy val pirateUri = uri(s"https://github.com/Kevin-Lee/pirate.git#$pirateVersion")
 
 lazy val cli = (project in file("cli"))
-    .enablePlugins(JavaAppPackaging)
-    .enablePlugins(DevOopsGitReleasePlugin)
-    .settings(
-        name := s"$ProjectNamePrefix-cli"
-      , crossScalaVersions := CrossScalaVersionsWithout2_10
-      , resolvers += hedgehogRepo
-      , libraryDependencies ++= hedgehogLibs
-      , testFrameworks ++= Seq(TestFramework("hedgehog.sbt.Framework"))
-      /* Coveralls { */
-      , coverageHighlighting := (CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, 10)) =>
-          false
-        case _ =>
-          true
-      })
-      /* } Coveralls */
-      , maintainer := "Kevin Lee <kevin.code@kevinlee.io>"
-      , packageSummary := "Maven2Sbt"
-      , packageDescription := "A tool to convert Maven pom.xml into sbt build.sbt"
-      /* GitHub Release { */
-      , devOopsPackagedArtifacts := List(
-          s"target/universal/${name.value}*.zip"
-        , s"target/${name.value}*.deb"
-        , s"target/universal/${name.value}*.tgz"
-        )
-      /* } GitHub Release */
-    )
-    .dependsOn(core, ProjectRef(pirateUri, "pirate"))
+  .enablePlugins(JavaAppPackaging)
+  .settings(
+      name := s"$ProjectNamePrefix-cli"
+    , crossScalaVersions := CrossScalaVersionsWithout2_10
+    , resolvers += hedgehogRepo
+    , libraryDependencies ++= hedgehogLibs
+    , testFrameworks ++= Seq(TestFramework("hedgehog.sbt.Framework"))
+    /* Coveralls { */
+    , coverageHighlighting := (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, 10)) =>
+        false
+      case _ =>
+        true
+    })
+    /* } Coveralls */
+    , maintainer := "Kevin Lee <kevin.code@kevinlee.io>"
+    , packageSummary := "Maven2Sbt"
+    , packageDescription := "A tool to convert Maven pom.xml into sbt build.sbt"
+  )
+  .dependsOn(core, ProjectRef(pirateUri, "pirate"))
 
 lazy val maven2sbt = (project in file("."))
+  .enablePlugins(DevOopsGitReleasePlugin)
   .settings(
-    name := ProjectNamePrefix
+      name := ProjectNamePrefix
+      /* GitHub Release { */
+    , devOopsPackagedArtifacts := List(
+        s"core/target/scala-*/${name.value}*.jar"
+      , s"cli/target/universal/${name.value}*.zip"
+      , s"cli/target/universal/${name.value}*.tgz"
+      , s"cli/target/${name.value}*.deb"
+      )
+    /* } GitHub Release */
   )
   .aggregate(core, cli)