fix ci-release-cont (#497)

Author: sideeffffect

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '17', '21' ]
+        java: ['8', '11', '17', '21']
     steps:
       - uses: actions/[email protected]
         with:

build.sbt

@@ -78,6 +78,8 @@ lazy val commonSettings: List[Def.Setting[_]] = List(
 
 lazy val ciReleaseCont = {
   commands += Command.command("ci-release-cont") { currentState =>
+    val version = CiReleasePlugin.getVersion(currentState)
+    val isSnapshot = CiReleasePlugin.isSnapshotVersion(version)
     if (!CiReleasePlugin.isSecure) {
       println("No access to secret variables, doing nothing")
       currentState
@@ -90,14 +92,19 @@ lazy val ciReleaseCont = {
       // https://github.com/olafurpg/sbt-ci-release/issues/64
       val reloadKeyFiles =
         "; set pgpSecretRing := pgpSecretRing.value; set pgpPublicRing := pgpPublicRing.value"
+
+      val publishCommand = CiReleasePlugin.getPublishCommand(currentState)
+
       if (!CiReleasePlugin.isTag && !git.gitCurrentBranch.value.contains("master")) {
-        if (CiReleasePlugin.isSnapshotVersion(version.value)) {
+        if (isSnapshot) {
           println(s"No tag push, publishing SNAPSHOT")
           reloadKeyFiles ::
+            sys.env.getOrElse("CI_CLEAN", "; clean") ::
+            // workaround for *.asc.sha1 not being allowed
             sys.env.getOrElse("CI_SNAPSHOT_RELEASE", "+publish") ::
             currentState
         } else {
-          // Happens when a tag is pushed right after merge causing the master branch
+          // Happens when a tag is pushed right after merge causing the main branch
           // job to pick up a non-SNAPSHOT version even if TRAVIS_TAG=false.
           println(
             "Snapshot releases must have -SNAPSHOT version number, doing nothing",
@@ -107,9 +114,9 @@ lazy val ciReleaseCont = {
       } else {
         println("Tag push detected, publishing a stable release")
         reloadKeyFiles ::
-          sys.env.getOrElse("CI_CLEAN", "; clean ; sonatypeBundleClean") ::
-          sys.env.getOrElse("CI_RELEASE", "+publishSigned") ::
-          sys.env.getOrElse("CI_SONATYPE_RELEASE", "sonatypeBundleRelease") ::
+          sys.env.getOrElse("CI_CLEAN", "; clean") ::
+          publishCommand ::
+          sys.env.getOrElse("CI_SONATYPE_RELEASE", "sonaRelease") ::
           currentState
       }
     }