Skip to content

Commit

Permalink
Merge pull request #145 from bpitman/master
Browse files Browse the repository at this point in the history
update branch selection
  • Loading branch information
brharrington committed Jul 24, 2015
2 parents e20435f + 354c087 commit 460a477
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion project/GitVersion.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object GitVersion {
val snapshotVersion = """v?([0-9\.]+)-(\d+)-([0-9a-z]+)""".r
val releaseVersion = """v?([0-9\.]+)""".r
val isPullRequest = sys.env.getOrElse("TRAVIS_PULL_REQUEST", "false") != "false"
val branch = git.gitCurrentBranch.value
val branch = GitKeys.gitReader.value.withGit(_.branches).headOption.getOrElse("unknown")
git.gitDescribedVersion.value getOrElse "0.1-SNAPSHOT" match {
case v if (isPullRequest) => s"0.0.0-PULLREQUEST"
case snapshotVersion(v, n, h) => {
Expand Down

0 comments on commit 460a477

Please sign in to comment.