Remove Travis CI matrix for now (best utilized when/if we have other platforms/arches)

This commit is contained in:
Seth Goings 2015-01-02 16:52:15 -07:00
parent 022efafbcc
commit ab83e852ff
2 changed files with 7 additions and 20 deletions

View File

@ -6,15 +6,7 @@ before_install:
env:
matrix:
- BUILD_STEP="jdk-test"
- BUILD_STEP="test"
- BUILD_STEP="mode=debug test"
- BUILD_STEP="process=interpret test"
- BUILD_STEP="mode=debug bootimage=true test"
- BUILD_STEP="bootimage=true test"
- BUILD_STEP="openjdk=$JAVA_HOME test"
- BUILD_STEP="tails=true continuations=true heapdump=true test"
- BUILD_STEP="codegen-targets=all test"
- BUILD_STEP=""
- BUILD_STEP="PUBLISH"
global:
- TERM=dumb
@ -24,4 +16,4 @@ env:
matrix:
fast_finish: true
script: ./test/ci.sh STEP ${BUILD_STEP}
script: ./test/ci.sh ${BUILD_STEP}

View File

@ -54,17 +54,12 @@ has_flag() {
make_target=test
if [[ "${1}" == "STEP" ]]; then
shift 1
if [[ "${1}" == "PUBLISH" ]]; then
if [[ "${1}" == "PUBLISH" ]]; then
if [[ $(uname -s) == "Darwin" || ${TRAVIS_OS_NAME} == "osx" ]]; then
publish "macosx" "i386 x86_64"
elif [[ $(uname -s) == "Linux" ]]; then
publish "linux windows" "i386 x86_64"
fi
else
run make ${@}
fi
else
if [[ $(uname -o) != "Cygwin" ]]; then
run_cmake -DCMAKE_BUILD_TYPE=Debug