Skip to content
This repository has been archived by the owner on Apr 22, 2020. It is now read-only.

Fix release process #1239

Merged
merged 1 commit into from
Jan 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions project/ProjectPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
import sbtorgpolicies.model.scalac
import sbtorgpolicies.runnable.syntax._
import sbtorgpolicies.templates.badges._
import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._
import sbtrelease.ReleasePlugin.autoImport._

object ProjectPlugin extends AutoPlugin {

Expand Down Expand Up @@ -61,6 +63,21 @@ object ProjectPlugin extends AutoPlugin {
)
},
scriptedBufferLog := false,
// TODO this custom release process can be removed when the cyclic dependency is upgraded to 0.12.3 or newer
releaseProcess := Seq[ReleaseStep](
orgInitialVcsChecks,
checkSnapshotDependencies,
orgInquireVersions,
if (sbtPlugin.value) releaseStepCommandAndRemaining("^ clean") else runClean,
if (sbtPlugin.value) releaseStepCommandAndRemaining("^ test") else runTest,
orgTagRelease,
orgUpdateChangeLog,
if (sbtPlugin.value) releaseStepCommandAndRemaining("^ publishSigned") else publishArtifacts,
releaseStepCommandAndRemaining("sonatypeBundleRelease"),
setNextVersion,
orgCommitNextVersion,
orgPostRelease
)
)

lazy val coreSettings: Seq[Def.Setting[_]] = commonSettings ++ Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/sbtorgpolicies/settings/AllSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ trait AllSettings
orgTagRelease,
orgUpdateChangeLog,
if (sbtPlugin.value) releaseStepCommandAndRemaining("^ publishSigned") else publishArtifacts,
releaseStepCommandAndRemaining("sonatypeBundleRelease"),
setNextVersion,
orgCommitNextVersion,
ReleaseStep(action = "sonatypeBundleRelease" :: _),
orgPostRelease
)
)
Expand Down