Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#105 #136

Merged
merged 10 commits into from
Feb 10, 2022
Merged

#105 #136

Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
db31486
Fail if tag is older than base version #105
osleonard Feb 3, 2022
dc27a17
Fail if tag is older than base version #105
osleonard Feb 3, 2022
cbc8517
Fail if tag is older than base version #105
osleonard Feb 4, 2022
266cbaa
Fail if tag is older than base version #105
osleonard Feb 4, 2022
3f7660d
Fail if tag is older than base version #105
osleonard Feb 4, 2022
c3b9792
Fail if tag is older than base version #105
osleonard Feb 4, 2022
fa53334
Fail if tag is older than base version #105
osleonard Feb 4, 2022
a323136
Update versioning/src/main/scala/org/typelevel/sbt/TypelevelVersionin…
osleonard Feb 4, 2022
c25dd34
Update versioning/src/main/scala/org/typelevel/sbt/TypelevelVersionin…
osleonard Feb 4, 2022
b3b9fc2
Fail if tag is older than base version #105
osleonard Feb 4, 2022
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
16 changes: 10 additions & 6 deletions versioning/src/main/scala/org/typelevel/sbt/TypelevelVersioningPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,18 @@ object TypelevelVersioningPlugin extends AutoPlugin {
None
}

// version here is the prefix used further to build a final version number
var version = latestInSeries.fold(tlBaseVersion.value)(_.toString)

// Looks for the distance to latest release in this series
latestInSeries.foreach { latestInSeries =>
Try(s"git describe --tags --match v$latestInSeries".!!.trim)
.collect { case Description(distance) => distance }
.foreach { distance => version += s"-$distance" }
}
if (version < baseV.toString)
osleonard marked this conversation as resolved.
Show resolved Hide resolved
sys.error(s"Your latest tag $version cannot be less than tlBaseVersion $baseV")
else
// Looks for the distance to latest release in this series
latestInSeries.foreach { latestInSeries =>
Try(s"git describe --tags --match v$latestInSeries".!!.trim)
.collect { case Description(distance) => distance }
.foreach { distance => version += s"-$distance" }
}

git.gitHeadCommit.value.foreach { sha => version += s"-${sha.take(7)}" }
version
Expand Down