Skip to content

Commit

Permalink
Merge pull request #99 from alexarchambault/tweak-travis-yml
Browse files Browse the repository at this point in the history
Tweak .travis.yml
  • Loading branch information
alexarchambault authored Mar 21, 2019
2 parents a4ed6f3 + 5f93a78 commit 9951260
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
language: scala
jdk:
- oraclejdk8
jdk: openjdk8
script: sbt -batch ++${TRAVIS_SCALA_VERSION} test:compile testJVM/test mimaReportBinaryIssues
sudo: false
before_install:
- git fetch --tags
git:
depth: false
stages:
- name: test
- name: release
Expand All @@ -17,6 +15,10 @@ jobs:
- scala: 2.13.0-M5
- stage: release
script: sbt ci-release
branches:
only:
- master
- /^v\d+\.\d+.*$/ # tagged versions
cache:
directories:
- $HOME/.cache
Expand Down
1 change: 0 additions & 1 deletion project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ object Settings {
lazy val shared = Seq(
scalaVersion := scala212,
crossScalaVersions := Seq(scala213, scala212, scala211, scala210),
resolvers += Resolver.sonatypeRepo("releases"),
libs ++= {
if (scalaBinaryVersion.value == "2.10")
Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch))
Expand Down

0 comments on commit 9951260

Please sign in to comment.