From 74d28eb1c4bb324e79142a34b00ca24ca98b06a9 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 4 Mar 2019 12:29:29 +0100 Subject: [PATCH] Tweak .travis.yml --- .travis.yml | 14 ++++++++------ scripts/travis.sh | 8 -------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ecb9677a..09cf89cd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,13 @@ -language: scala -scala: 2.12.7 +language: java os: linux -jdk: oraclejdk8 +jdk: openjdk8 +git: + depth: false # https://stackoverflow.com/a/51727114/3714539 before_install: - - git fetch --tags -script: - - scripts/travis.sh + - mkdir .bin && curl -Lo .bin/sbt https://raw.githubusercontent.com/paulp/sbt-extras/a56bf05b1113e251aeaf7542f48c45c6c2691d4d/sbt + - export PATH="$(pwd)/.bin:$PATH" + - export TRAVIS_SCALA_VERSION=2.12.8 +script: scripts/travis.sh stages: - name: test - name: release diff --git a/scripts/travis.sh b/scripts/travis.sh index b45bd8a02..55382af60 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -1,12 +1,6 @@ #!/usr/bin/env bash set -euvx -downloadInstallSbtExtras() { - mkdir -p bin - curl -L -o bin/sbt https://github.com/paulp/sbt-extras/raw/9ade5fa54914ca8aded44105bf4b9a60966f3ccd/sbt - chmod +x bin/sbt -} - lmCoursier() { [ "${LM_COURSIER:-""}" = 1 ] } @@ -55,8 +49,6 @@ addPgpKeys() { } -downloadInstallSbtExtras - if sbtShading; then runSbtShadingTests elif sbtPgpCoursier; then