mirror of https://github.com/sbt/sbt.git
Merge pull request #323 from eed3si9n/wip/dont_use_homebrew
Remove Homebrew from CI
This commit is contained in:
commit
76d3c88ad9
|
|
@ -7,7 +7,7 @@ scala: 2.10.7
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- SBT_VER=1.3.0
|
- SBT_VER=1.3.10
|
||||||
- TRAVIS_JDK=adopt@1.8.0-222
|
- TRAVIS_JDK=adopt@1.8.0-222
|
||||||
- JABBA_HOME=$HOME/.jabba
|
- JABBA_HOME=$HOME/.jabba
|
||||||
- TRAVIS_JDK11=openjdk@1.11.0
|
- TRAVIS_JDK11=openjdk@1.11.0
|
||||||
|
|
@ -23,7 +23,7 @@ matrix:
|
||||||
install:
|
install:
|
||||||
- $JABBA_HOME/bin/jabba.exe install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH"
|
- $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
|
- 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
|
- unzip /tmp/sbt.zip -d $HOME/sbt
|
||||||
- export PATH="$HOME/sbt/sbt/bin:$PATH"
|
- export PATH="$HOME/sbt/sbt/bin:$PATH"
|
||||||
script:
|
script:
|
||||||
|
|
@ -38,12 +38,13 @@ matrix:
|
||||||
language: java
|
language: java
|
||||||
before_install:
|
before_install:
|
||||||
- curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh | bash && . ~/.jabba/jabba.sh
|
- curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh | bash && . ~/.jabba/jabba.sh
|
||||||
- brew update
|
|
||||||
- brew install sbt
|
|
||||||
install:
|
install:
|
||||||
- $JABBA_HOME/bin/jabba install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK/Contents/Home" && export PATH="$JAVA_HOME/bin:$PATH"
|
- $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
|
- java -Xmx32m -version
|
||||||
- unset SBT_OPTS
|
- 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:
|
script:
|
||||||
- sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test
|
- sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test
|
||||||
- cd citest && ./test.sh
|
- cd citest && ./test.sh
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
sbt.version=1.3.0
|
sbt.version=1.3.10
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue