Implement step 9

[jackhill/mal.git] / .travis_build.sh

diff --git a/.travis_build.sh b/.travis_build.sh
dissimilarity index 74%
index 3364be3..308965e 100755 (executable)
--- a/.travis_build.sh
+++ b/.travis_build.sh
@@ -1,20 +1,27 @@
-#!/bin/bash
-
-set -ex
-
-case ${TRAVIS_OS_NAME} in
-linux)
-    BUILD_IMPL=${BUILD_IMPL:-${IMPL}}
-    impl=$(echo "${IMPL}" | tr '[:upper:]' '[:lower:]')
-    build_impl=$(echo "${BUILD_IMPL}" | tr '[:upper:]' '[:lower:]')
-
-    docker pull kanaka/mal-test-${impl}
-    if [ "${impl}" != "${build_impl}" ]; then
-        docker pull kanaka/mal-test-${build_impl}
-    fi
-    docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${build_impl} make -C ${BUILD_IMPL}
-    ;;
-osx)
-    make -C ${IMPL}
-    ;;
-esac
+#!/bin/bash
+
+set -ex
+
+BUILD_IMPL=${BUILD_IMPL:-${IMPL}}
+
+# If NO_DOCKER is blank then launch use a docker image, otherwise
+# use the Travis image/tools directly.
+if [ -z "${NO_DOCKER}" ]; then
+    impl=$(echo "${IMPL}" | tr '[:upper:]' '[:lower:]')
+    img_impl=$(echo "${BUILD_IMPL}" | tr '[:upper:]' '[:lower:]')
+
+    docker pull kanaka/mal-test-${impl}
+    if [ "${impl}" != "${img_impl}" ]; then
+        docker pull kanaka/mal-test-${img_impl}
+    fi
+    if [ "${BUILD_IMPL}" = "rpython" ]; then
+        # rpython often fails on step9 in compute_vars_longevity
+        # so build step9, then continue wit the full build
+        docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${img_impl} \
+            make -C ${BUILD_IMPL} step9_try || true
+    fi
+    docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${img_impl} \
+        make -C ${BUILD_IMPL}
+else
+    make -C ${BUILD_IMPL}
+fi