From f8f9ed0c677d0584201263d69e8d4a653b29d8ab Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 14 Nov 2020 12:31:34 -0500 Subject: [PATCH] Nightly setup --- build.sbt | 33 +++++++++++++++++++++------------ project/Dependencies.scala | 3 ++- project/build.properties | 2 +- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index 3fe9fff8f..1157395d7 100644 --- a/build.sbt +++ b/build.sbt @@ -7,15 +7,6 @@ val _ = { sys.props += ("line.separator" -> "\n") } -ThisBuild / version := { - val old = (ThisBuild / version).value - nightlyVersion match { - case Some(v) => v - case _ => - if ((ThisBuild / isSnapshot).value) "1.4.0-SNAPSHOT" - else old - } -} ThisBuild / versionScheme := Some("early-semver") ThisBuild / organization := "org.scala-sbt" ThisBuild / bintrayPackage := "librarymanagement" @@ -375,11 +366,29 @@ def customCommands: Seq[Setting[_]] = Seq( } ) +ThisBuild / version := { + val old = (ThisBuild / version).value + nightlyVersion match { + case Some(v) => v + case _ => + if ((ThisBuild / isSnapshot).value) "1.4.0-SNAPSHOT" + else old + } +} +def githubPackageRegistry: Option[Resolver] = + sys.env.get("RELEASE_GITHUB_PACKAGE_REGISTRY") map { repo => + s"GitHub Package Registry ($repo)" at s"https://maven.pkg.github.com/$repo" + } ThisBuild / publishTo := { val old = (ThisBuild / publishTo).value - sys.props.get("sbt.build.localmaven") match { - case Some(path) => Some(MavenCache("local-maven", file(path))) - case _ => old + githubPackageRegistry orElse old +} +ThisBuild / resolvers ++= githubPackageRegistry.toList +ThisBuild / credentials ++= { + sys.env.get("GITHUB_TOKEN") match { + case Some(token) => + List(Credentials("GitHub Package Registry", "maven.pkg.github.com", "unused", token)) + case _ => Nil } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fcb7ecbbc..f4dc77eb2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,8 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { val scala212 = "2.12.10" - def nightlyVersion: Option[String] = sys.props.get("sbt.build.version") + def nightlyVersion: Option[String] = + sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version") private val ioVersion = nightlyVersion.getOrElse("1.4.0") private val utilVersion = nightlyVersion.getOrElse("1.4.0") diff --git a/project/build.properties b/project/build.properties index ea3a73ab1..c19c768d6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.0-RC2 +sbt.version=1.4.2