Address travis timeout issues (purescript#2647)

hdgarrood · web-flow · commit ca359500f948 · 2017-02-09T22:59:50.000Z
These commits amend the CI scripts so that if a build does time out, the next one can continue where the previous left off. For more info see https://gist.github.com/hdgarrood/29fa8ebcd5b5acd679cf429fd0a93e3e This enables us to enable OSX builds again (which I have done).
diff --git a/.travis.yml b/.travis.yml
@@ -3,49 +3,38 @@ dist: trusty # because of perf issues
 sudo: required
 matrix:
   include:
-    # The 'compiler' key is a hack to get Travis to use different caches for
-    # each job in a build, in order to avoid the separate jobs stomping on each
-    # other's caches. See https://github.com/travis-ci/travis-ci/issues/4393
-    #
     # We use trusty boxes because they seem to be a bit faster.
-    - compiler: cc-linux-lts-normal
-      os: linux
+    - os: linux
       dist: trusty
       sudo: required
       env: BUILD_TYPE=normal DEPLOY=true
 
-    # - compiler: cc-linux-nightly-normal
-    #   os: linux
+    # - os: linux
     #   dist: trusty
     #   sudo: required
     #   env: BUILD_TYPE=normal STACKAGE_NIGHTLY=true
     #   allow_failures: true
 
-    - compiler: cc-linux-ghc8.0-normal
-      os: linux
+    - os: linux
       dist: trusty
       sudo: required
       env: BUILD_TYPE=normal STACK_YAML=stack-ghc-8.0.yaml
 
-    - compiler: cc-linux-lts-sdist
-      os: linux
+    - os: linux
       dist: trusty
       sudo: required
       env: BUILD_TYPE=sdist COVERAGE=true
 
-    - compiler: cc-linux-lts-haddock
-      os: linux
+    - os: linux
       dist: trusty
       sudo: required
       env: BUILD_TYPE=haddock
 
-    # - compiler: cc-osx-lts-normal
-    #   os: osx
-    #   env: BUILD_TYPE=normal DEPLOY=true
-    
-    # - compiler: cc-osx-lts-sdist
-    #   os: osx
-    #   env: BUILD_TYPE=sdist
+    - os: osx
+      env: BUILD_TYPE=normal DEPLOY=true
+
+    - os: osx
+      env: BUILD_TYPE=sdist
 addons:
   apt:
     packages:
@@ -54,6 +43,11 @@ cache:
   directories:
   - $HOME/.local/bin
   - $HOME/.stack
+  # Maximum amount of time in seconds spent attempting to upload a new cache
+  # before aborting. Since our cache can get rather large, increasing this
+  # value helps avoid situations where caches fail to be stored. The default
+  # value is 180 (at the time of writing).
+  timeout: 1000
 install:
 - | # Install stack.
   if test ! -f "$HOME/.local/bin/stack"
@@ -66,9 +60,20 @@ install:
     mv stack "$HOME/.local/bin/"
   fi
 - npm install -g bower # for psc-docs / psc-publish tests
-# Fix the CC environment variable, because Travis changes it
-- export CC=gcc
 - export OS_NAME=$(./travis/convert-os-name.sh)
+# Install 'timeout'
+- |
+  if [ "$TRAVIS_OS_NAME" == "osx" ]
+  then
+    if ! which gtimeout >/dev/null
+    then
+      brew update
+      brew install coreutils
+    fi
+    export TIMEOUT=gtimeout
+  else
+    export TIMEOUT=timeout
+  fi
 script:
 - travis/build.sh
 before_deploy:
diff --git a/travis/build.sh b/travis/build.sh
@@ -2,7 +2,25 @@
 set -e
 
 STACK="stack --no-terminal --jobs=1"
-$STACK setup
+
+# Setup & install dependencies or abort
+ret=0
+$TIMEOUT 40m $STACK --install-ghc build \
+  --only-dependencies --test --haddock \
+  || ret=$?
+case "$ret" in
+  0) # continue
+    ;;
+  124)
+    echo "Timed out while installing dependencies."
+    echo "Try pushing a new commit to build again."
+    exit 1
+    ;;
+  *)
+    echo "Failed to install dependencies."
+    exit 1
+    ;;
+esac
 
 # Set up configuration
 STACK_EXTRA_FLAGS=""
