Skip to content

Commit 9227edb

Browse files
committed
Use non-strictly-previous releases in site plugin
1 parent e48a592 commit 9227edb

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

kernel/src/main/scala/org/typelevel/sbt/kernel/GitHelper.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ private[sbt] object GitHelper {
2727
* @param fromHead
2828
* if `true`, only tags reachable from HEAD's history. If `false`, all tags in the repo.
2929
*/
30-
def previousReleases(fromHead: Boolean = false): List[V] =
30+
def previousReleases(fromHead: Boolean = false, strict: Boolean = true): List[V] =
3131
Try {
3232
val merged = if (fromHead) " --merged HEAD" else ""
3333
// --no-contains omits tags on HEAD
34-
s"git -c versionsort.suffix=- tag --no-contains HEAD$merged --sort=-v:refname" // reverse
34+
val noContains = if (strict) " --no-contains HEAD" else ""
35+
s"git -c versionsort.suffix=- tag$noContains$merged --sort=-v:refname" // reverse
3536
.!!
3637
.split("\n")
3738
.toList

site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ object TypelevelSitePlugin extends AutoPlugin {
253253
// and there are no stable releases it is bincompatible with,
254254
// then for all effective purposes it is the current release
255255

256-
val release = GitHelper.previousReleases(fromHead = true) match {
256+
val release = GitHelper.previousReleases(fromHead = true, strict = false) match {
257257
case head :: tail if head.isPrerelease =>
258258
tail
259259
.filterNot(_.isPrerelease)
@@ -267,7 +267,7 @@ object TypelevelSitePlugin extends AutoPlugin {
267267

268268
// latest tagged release, including pre-releases
269269
private lazy val currentPreRelease = Def.setting {
270-
GitHelper.previousReleases(fromHead = true).headOption.map(_.toString)
270+
GitHelper.previousReleases(fromHead = true, strict = false).headOption.map(_.toString)
271271
}
272272

273273
private def previewTask = Def

0 commit comments

Comments
 (0)