From 04eb7eb02fdfd2a37b0f940c437b3d98832ff5a6 Mon Sep 17 00:00:00 2001 From: Filippo Mariotti Date: Sat, 13 Jun 2020 17:14:22 +0100 Subject: [PATCH 1/3] Some travis ci updates --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0c63b6148..fa10c9c757 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ jdk: - openjdk8 -scala_version_212: &scala_version_212 2.12.10 -scala_version_213: &scala_version_213 2.13.1 +scala_version_212: &scala_version_212 2.12.11 +scala_version_213: &scala_version_213 2.13.2 before_install: - export PATH=${PATH}:./vendor/bundle @@ -56,10 +56,11 @@ jobs: - stage: test - name: Make Microsite + name: Make Microsite 2.12 env: TEST="docs" install: gem install jekyll -v 4.0.0 - script: sbt docs/makeMicrosite + script: sbt ++$TRAVIS_SCALA_VERSION! docs/makeMicrosite + scala: *scala_version_212 - stage: test name: Scalafix tests @@ -115,7 +116,7 @@ cache: - $HOME/.m2 - $HOME/.ivy2/cache - $HOME/.sbt - - $HOME/.coursier + - $HOME/.cache/coursier # Pants cache - $HOME/.cache From ccf9e5e6843c2e0e200e8ee854ed4b71a4b61e42 Mon Sep 17 00:00:00 2001 From: Filippo Mariotti Date: Sat, 13 Jun 2020 17:54:42 +0100 Subject: [PATCH 2/3] Reverted microsite Scala version. Keep forgetting about this --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa10c9c757..920a97d2a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,11 +56,10 @@ jobs: - stage: test - name: Make Microsite 2.12 + name: Make Microsite env: TEST="docs" install: gem install jekyll -v 4.0.0 - script: sbt ++$TRAVIS_SCALA_VERSION! docs/makeMicrosite - scala: *scala_version_212 + script: sbt docs/makeMicrosite - stage: test name: Scalafix tests From 75acd16c4d5900772b23421f9b33b86d4b309b80 Mon Sep 17 00:00:00 2001 From: Filippo Mariotti Date: Sat, 13 Jun 2020 18:44:36 +0100 Subject: [PATCH 3/3] Forcing tut make on 2.12.10 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 920a97d2a3..0af6325cbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,10 +56,10 @@ jobs: - stage: test - name: Make Microsite + name: Make Microsite on 2.12.10 env: TEST="docs" install: gem install jekyll -v 4.0.0 - script: sbt docs/makeMicrosite + script: sbt ++2.12.10! docs/makeMicrosite - stage: test name: Scalafix tests