Merge pull request #41 from armanbilge/topic/ci-release-config

Improve CI release config

build.sbt

@@ -7,8 +7,6 @@ ThisBuild / organizationName := "Typelevel"
 ThisBuild / scalaVersion := "2.12.15"
 
 enablePlugins(TypelevelCiReleasePlugin)
-ThisBuild / tlCiReleaseSnapshots := true
-ThisBuild / tlCiReleaseBranches := Seq("main")
 
 ThisBuild / developers := List(
   tlGitHubDev("armanbilge", "Arman Bilge"),

core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala

@@ -42,6 +42,7 @@ object TypelevelPlugin extends AutoPlugin {
   import autoImport._
   import TypelevelKernelPlugin.autoImport._
   import TypelevelSettingsPlugin.autoImport._
+  import TypelevelSonatypeCiReleasePlugin.autoImport._
   import GenerativePlugin.autoImport._
   import GitHubActionsPlugin.autoImport._
 
@@ -54,6 +55,7 @@ object TypelevelPlugin extends AutoPlugin {
     organizationName := "Typelevel",
     startYear := Some(java.time.YearMonth.now().getYear()),
     licenses += "Apache-2.0" -> url("http://www.apache.org/licenses/"),
+    tlCiReleaseBranches := Seq("main"),
     Def.derive(tlFatalWarnings := (tlFatalWarningsInCi.value && githubIsWorkflowBuild.value)),
     githubWorkflowBuildMatrixExclusions ++= {
       for {

sonatype-ci-release/src/main/scala/org/typelevel/sbt/TypelevelSonatypeCiReleasePlugin.scala

@@ -24,10 +24,10 @@ import sbtghactions.GenerativePlugin.autoImport._
 object TypelevelSonatypeCiReleasePlugin extends AutoPlugin {
 
   object autoImport {
-    lazy val tlCiReleaseSnapshots = settingKey[Boolean](
-      "Controls whether or not snapshots should be released (default: false)")
-    lazy val tlCiReleaseBranches =
-      settingKey[Seq[String]]("The branches in your repository to release from (default: [])")
+    lazy val tlCiReleaseTags = settingKey[Boolean](
+      "Controls whether or not v-prefixed tags should be released from CI (default true)")
+    lazy val tlCiReleaseBranches = settingKey[Seq[String]](
+      "The branches in your repository to release from in CI on every push. Depending on your versioning scheme, they will be either snapshots or (hash) releases. Leave this empty if you only want CI releases for tags. (default: [])")
   }
 
   import autoImport._
@@ -38,21 +38,24 @@ object TypelevelSonatypeCiReleasePlugin extends AutoPlugin {
   override def trigger = noTrigger
 
   override def globalSettings =
-    Seq(tlCiReleaseSnapshots := false, tlCiReleaseBranches := Seq())
+    Seq(tlCiReleaseTags := true, tlCiReleaseBranches := Seq())
 
   override def buildSettings = Seq(
     githubWorkflowEnv ++= Map(
       "SONATYPE_USERNAME" -> s"$${{ secrets.SONATYPE_USERNAME }}",
       "SONATYPE_PASSWORD" -> s"$${{ secrets.SONATYPE_PASSWORD }}"
     ),
     githubWorkflowPublishTargetBranches := {
-      val seed =
-        if (tlCiReleaseSnapshots.value)
-          tlCiReleaseBranches.value.map(b => RefPredicate.Equals(Ref.Branch(b)))
+      val branches =
+        tlCiReleaseBranches.value.map(b => RefPredicate.Equals(Ref.Branch(b)))
+
+      val tags =
+        if (tlCiReleaseTags.value)
+          Seq(RefPredicate.StartsWith(Ref.Tag("v")))
         else
           Seq.empty
 
-      RefPredicate.StartsWith(Ref.Tag("v")) +: seed
+      tags ++ branches
     },
     githubWorkflowTargetTags += "v*",
     githubWorkflowPublish := Seq(