Skip to content

Commit ad11e73

Browse files
committed
Use environment variable to initialize isRelease.
Previously we were only releasing SNAPSHOTs.
1 parent 93159bf commit ad11e73

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

build.sbt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ scalaVersionSettings
66

77
lazy val versionNumber = "1.14.2"
88

9-
val isRelease = SettingKey[Boolean]("isRelease")
9+
def env(name: String): Option[String] =
10+
Option(System.getenv(name))
1011

11-
lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))
12+
val isRelease = env("IS_RELEASE").exists(_ == "true")
13+
14+
lazy val travisCommit = env("TRAVIS_COMMIT")
1215

1316
lazy val scalaVersionSettings = Seq(
1417
scalaVersion := "2.13.1",
@@ -22,22 +25,20 @@ lazy val scalaVersionSettings = Seq(
2225
)
2326

2427
lazy val scalaJSVersion =
25-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.29")
28+
env("SCALAJS_VERSION").getOrElse("0.6.29")
2629

2730
lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
2831

2932
name := "scalacheck",
3033

31-
isRelease := false,
32-
3334
version := {
3435
val suffix =
35-
if (isRelease.value) ""
36+
if (isRelease) ""
3637
else travisCommit.map("-" + _.take(7)).getOrElse("") + "-SNAPSHOT"
3738
versionNumber + suffix
3839
},
3940

40-
isSnapshot := !isRelease.value,
41+
isSnapshot := !isRelease,
4142

4243
organization := "org.scalacheck",
4344

@@ -46,8 +47,8 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
4647
homepage := Some(url("http://www.scalacheck.org")),
4748

4849
credentials ++= (for {
49-
username <- Option(System.getenv().get("SONATYPE_USERNAME"))
50-
password <- Option(System.getenv().get("SONATYPE_PASSWORD"))
50+
username <- env("SONATYPE_USERNAME")
51+
password <- env("SONATYPE_PASSWORD")
5152
} yield Credentials(
5253
"Sonatype Nexus Repository Manager",
5354
"oss.sonatype.org",
@@ -127,7 +128,7 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
127128
publishMavenStyle := true,
128129

129130
// Travis should only publish snapshots
130-
publishArtifact := !(isRelease.value && travisCommit.isDefined),
131+
publishArtifact := !(isRelease && travisCommit.isDefined),
131132

132133
publishArtifact in Test := false,
133134

release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ usage() {
3030
}
3131

3232
runsbt() {
33-
sbt "$1"
33+
IS_RELEASE="true" sbt "$1"
3434
RES=$?
3535
if [ $RES -ne 0 ]; then
36-
echo "sbt 'set every isRelease := true' '$1' failed: $RES"
36+
echo "sbt '$1' failed: $RES"
3737
exit $RES
3838
fi
3939
}

0 commit comments

Comments
 (0)