From c55cccd4d506dbdd20cca9650474299bebacc405 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 28 May 2020 23:32:53 -0400 Subject: [PATCH] Remove Homebrew from CI Ref https://github.com/Homebrew/homebrew-core/issues/50649 --- .travis.yml | 9 +++++---- citest/project/build.properties | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61df38bfb..884261bad 100755 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ scala: 2.10.7 env: global: - - SBT_VER=1.3.0 + - SBT_VER=1.3.10 - TRAVIS_JDK=adopt@1.8.0-222 - JABBA_HOME=$HOME/.jabba - TRAVIS_JDK11=openjdk@1.11.0 @@ -23,7 +23,7 @@ matrix: install: - $JABBA_HOME/bin/jabba.exe install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" - java -Xmx32m -version - - curl https://piccolo.link/sbt-1.2.8.zip -L --output /tmp/sbt.zip + - curl https://piccolo.link/sbt-$SBT_VER.zip -L --output /tmp/sbt.zip - unzip /tmp/sbt.zip -d $HOME/sbt - export PATH="$HOME/sbt/sbt/bin:$PATH" script: @@ -38,12 +38,13 @@ matrix: language: java before_install: - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh | bash && . ~/.jabba/jabba.sh - - brew update - - brew install sbt install: - $JABBA_HOME/bin/jabba install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK/Contents/Home" && export PATH="$JAVA_HOME/bin:$PATH" - java -Xmx32m -version - unset SBT_OPTS + - curl https://piccolo.link/sbt-$SBT_VER.zip -L --output /tmp/sbt.zip + - unzip /tmp/sbt.zip -d $HOME/sbt + - export PATH="$HOME/sbt/sbt/bin:$PATH" script: - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - cd citest && ./test.sh diff --git a/citest/project/build.properties b/citest/project/build.properties index 080a737ed..797e7ccfd 100644 --- a/citest/project/build.properties +++ b/citest/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.0 +sbt.version=1.3.10