Fix CI release

* sonatypeProfileName "com.lightbend" in projectSettings * correction of tags
akka · Apr 26, 2021 · 1d8c779 · 1d8c779
1 parent 60634f5
commit 1d8c779
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
       - release-*
-    tags: [ v.* ]
+    tags: ["*"]
 
 jobs:
   release:

diff --git a/project/Common.scala b/project/Common.scala
@@ -1,13 +1,15 @@
+import com.geirsson.CiReleasePlugin
 import com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys._
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
 import de.heikoseeberger.sbtheader._
 import sbt.Keys._
 import sbt._
+import xerial.sbt.Sonatype.autoImport.sonatypeProfileName
 
 object Common extends AutoPlugin {
 
   override def trigger = allRequirements
-  override def requires = plugins.JvmPlugin && HeaderPlugin
+  override def requires = plugins.JvmPlugin && HeaderPlugin && CiReleasePlugin
 
   val currentYear = "2021"
 
@@ -61,20 +63,21 @@ object Common extends AutoPlugin {
           "akka.pattern" // for some reason Scaladoc creates this
         ),
       Compile / doc / scalacOptions ++= Seq(
-        "-doc-source-url", {
-          val branch = if (isSnapshot.value) "master" else s"v${version.value}"
-          s"https://github.com/akka/akka-management/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}"
-        },
-        "-doc-canonical-base-url",
-        "https://doc.akka.io/api/akka-management/current/"
-      ),
+          "-doc-source-url", {
+            val branch = if (isSnapshot.value) "master" else s"v${version.value}"
+            s"https://github.com/akka/akka-management/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}"
+          },
+          "-doc-canonical-base-url",
+          "https://doc.akka.io/api/akka-management/current/"
+        ),
       autoAPIMappings := true,
       // show full stack traces and test case durations
       testOptions in Test += Tests.Argument("-oDF"),
       // -v Log "test run started" / "test started" / "test run finished" events on log level "info" instead of "debug".
       // -a Show stack traces and exception class name for AssertionErrors.
       testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
-      scalaVersion := Dependencies.Scala212
+      scalaVersion := Dependencies.Scala212,
+      sonatypeProfileName := "com.lightbend"
     )
 
   private def isJdk8 =