Skip to content

re-enable Scala 2.11 in CI matrix #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 8, 2019
Merged

re-enable Scala 2.11 in CI matrix #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e79b86
re-enable Scala 2.11 in CI matrix
SethTisue Feb 8, 2019
9100116
rename build command to follow current sbt naming convention
SethTisue Feb 8, 2019
cae8b10
fix JDK 11 jobs
SethTisue Feb 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ env:
- SCALAJS_VERSION=1.0.0-M6

matrix:
exclude:
# ?
- jdk: oraclejdk8
scala: 2.11.12

include:

Expand Down
17 changes: 9 additions & 8 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ lazy val dontPublish = Seq(
publishLocal := {}
)

val preRelease = "pre-release"
val preRelease = "preRelease"
val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse)
val releaseVersion = sys.env.get("TRAVIS_TAG").flatMap(Version.parse)
val isScalaJs = sys.env.get("SCALAJS_VERSION").map(_.nonEmpty).getOrElse(false)
Expand Down Expand Up @@ -287,13 +287,14 @@ inThisBuild(
commands += Command.command(preRelease) { state =>
// Show Compat version, Scala version, and Java Version
val jvmVersion = Version.parse(sys.props("java.specification.version")).get.minor
val tagVersion = releaseVersion.get
println(
s"Releasing $tagVersion with Scala ${travisScalaVersion.get} on Java version $jvmVersion.")

// Copy pgp stuff
"admin/pre-release.sh" ! state.globalLogging.full

releaseVersion match {
case Some(tagVersion) =>
println(
s"Releasing $tagVersion with Scala ${travisScalaVersion.get} on Java version $jvmVersion.")
// Copy pgp stuff
"admin/pre-release.sh" ! state.globalLogging.full
case None =>
}
state
},
commands += Command.command("scalafmt-test") { state =>
Expand Down