Skip to content

Commit

Permalink
2.3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed Nov 26, 2020
1 parent b5aee60 commit 5c47602
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ on:
push:
branches:
- master
tags:
- "*"
pull_request:
branches:
- master
Expand Down
14 changes: 10 additions & 4 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import $ivy.`io.get-coursier::coursier-launcher:2.0.0-RC6-10`

val isMasterCommit =
sys.env.get("GITHUB_REPOSITORY") == Some("lihaoyi/Ammonite") &&
sys.env.get("GITHUB_REF").exists(x => x.endsWith("/master") || x.startsWith("refs/tags/"))
sys.env.get("GITHUB_REF").exists(x => x.endsWith("/master"))

val latestTaggedVersion = os.proc('git, 'describe, "--abbrev=0", "--tags").call().out.trim

Expand All @@ -33,11 +33,17 @@ val fullCrossScalaVersions = Seq(
val latestAssemblies = binCrossScalaVersions.map(amm(_).assembly)

println("GITHUB REF " + sys.env.get("GITHUB_REF"))
val (buildVersion, unstable) = sys.env.get("GITHUB_REF") match{
case Some(s"refs/tags/$tagName") => (tagName, false)
case _ =>

val (buildVersion, unstable) = scala.util.Try(
os.proc('git, 'describe, "--exact-match", "--tags", "--always", gitHead)
.call()
.out
.trim
).toOption match{
case None =>
val gitHash = os.proc("git", "rev-parse", "--short", "HEAD").call().out.trim
(s"$latestTaggedVersion-$commitsSinceTaggedVersion-$gitHash", true)
case Some(tagName) => (tagName, false)
}

val bspVersion = "2.0.0-M6"
Expand Down
2 changes: 1 addition & 1 deletion readme/Footer.scalatex
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@


@sect{Changelog}
@sect{2.3.6}
@sect{2.3.7}
@ul
@li
Replace the built in @code{@@main} method functionality with the
Expand Down

0 comments on commit 5c47602

Please sign in to comment.