From ab83e852ffb42d55eeee57acd31c6411bf957a58 Mon Sep 17 00:00:00 2001
From: Seth Goings <seth.goings@readytalk.com>
Date: Fri, 2 Jan 2015 16:52:15 -0700
Subject: [PATCH] Remove Travis CI matrix for now (best utilized when/if we
 have other platforms/arches)

---
 .travis.yml | 12 ++----------
 test/ci.sh  | 15 +++++----------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c4b64bf9d4..d0b12eeaee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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}
diff --git a/test/ci.sh b/test/ci.sh
index f318897bde..b84cd7f812 100755
--- a/test/ci.sh
+++ b/test/ci.sh
@@ -54,16 +54,11 @@ has_flag() {
 
 make_target=test
 
-if [[ "${1}" == "STEP" ]]; then
-  shift 1
-  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 ${@}
+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
   if [[ $(uname -o) != "Cygwin" ]]; then