Skip to content

Commit def354b

Browse files
authored
Merge pull request #181 from SethTisue/matrix-2.11
re-enable Scala 2.11 in CI matrix
2 parents 7b08a59 + cae8b10 commit def354b

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ env:
2222
- SCALAJS_VERSION=1.0.0-M6
2323

2424
matrix:
25-
exclude:
26-
# ?
27-
- jdk: oraclejdk8
28-
scala: 2.11.12
2925

3026
include:
3127

build.sbt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ lazy val dontPublish = Seq(
252252
publishLocal := {}
253253
)
254254

255-
val preRelease = "pre-release"
255+
val preRelease = "preRelease"
256256
val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse)
257257
val releaseVersion = sys.env.get("TRAVIS_TAG").flatMap(Version.parse)
258258
val isScalaJs = sys.env.get("SCALAJS_VERSION").map(_.nonEmpty).getOrElse(false)
@@ -287,13 +287,14 @@ inThisBuild(
287287
commands += Command.command(preRelease) { state =>
288288
// Show Compat version, Scala version, and Java Version
289289
val jvmVersion = Version.parse(sys.props("java.specification.version")).get.minor
290-
val tagVersion = releaseVersion.get
291-
println(
292-
s"Releasing $tagVersion with Scala ${travisScalaVersion.get} on Java version $jvmVersion.")
293-
294-
// Copy pgp stuff
295-
"admin/pre-release.sh" ! state.globalLogging.full
296-
290+
releaseVersion match {
291+
case Some(tagVersion) =>
292+
println(
293+
s"Releasing $tagVersion with Scala ${travisScalaVersion.get} on Java version $jvmVersion.")
294+
// Copy pgp stuff
295+
"admin/pre-release.sh" ! state.globalLogging.full
296+
case None =>
297+
}
297298
state
298299
},
299300
commands += Command.command("scalafmt-test") { state =>

0 commit comments

Comments
 (0)