luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SBT_ETC_FILE 

Travis CI adds `/etc/sbt/sbtopts` that prevents us from testing the out-of-box behavior. This allows us to override the location.
This commit is contained in:
Eugene Yokota 2019-09-22 18:07:28 -04:00
parent 7636a47c94
commit 0a09fa62ed
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -11,6 +11,8 @@ env:
- TRAVIS_JDK=adopt@1.8.212-04 - TRAVIS_JDK=adopt@1.8.212-04
- JABBA_HOME=$HOME/.jabba - JABBA_HOME=$HOME/.jabba
- TRAVIS_JDK11=openjdk@1.11.0 - TRAVIS_JDK11=openjdk@1.11.0
## ignore Travis CI's default /etc/sbt/sbtopts
- SBT_ETC_FILE=$HOME/etc/sbt/sbtopts
matrix: matrix:
include: include:
@ -41,6 +43,7 @@ matrix:
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
script: script:
- sbt -Dsbt.build.version=$SBT_VER universal:packageBin - sbt -Dsbt.build.version=$SBT_VER universal:packageBin
- cd citest && ./test.sh - cd citest && ./test.sh
@ -72,6 +75,7 @@ before_install:
install: install:
- $JABBA_HOME/bin/jabba install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" - $JABBA_HOME/bin/jabba install $TRAVIS_JDK && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH"
- java -Xmx32m -version - java -Xmx32m -version
- unset SBT_OPTS
cache: cache:
directories: directories:

4
src/universal/bin/sbt
View File

@ -385,6 +385,8 @@ run() {
declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy" declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
declare -r sbt_opts_file=".sbtopts" declare -r sbt_opts_file=".sbtopts"
declare -r etc_sbt_opts_file="/etc/sbt/sbtopts" declare -r etc_sbt_opts_file="/etc/sbt/sbtopts"
# this allows /etc/sbt/sbtopts location to be changed
declare -r etc_file="${SBT_ETC_FILE:-$etc_sbt_opts_file}"
declare -r dist_sbt_opts_file="${sbt_home}/conf/sbtopts" declare -r dist_sbt_opts_file="${sbt_home}/conf/sbtopts"
declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt" declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"
@ -546,7 +548,7 @@ loadConfigFile() {
[[ -f "$dist_sbt_opts_file" ]] && set -- $(loadConfigFile "$dist_sbt_opts_file") "$@" [[ -f "$dist_sbt_opts_file" ]] && set -- $(loadConfigFile "$dist_sbt_opts_file") "$@"
# Here we pull in the global settings configuration. # Here we pull in the global settings configuration.
[[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile "$etc_sbt_opts_file") "$@" [[ -f "$etc_file" ]] && set -- $(loadConfigFile "$etc_file") "$@"
# Pull in the project-level config file, if it exists. # Pull in the project-level config file, if it exists.
[[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@" [[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@"