Switch from evm to nix-emacs-ci

.travis.yml

@@ -1,35 +1,29 @@
-language: generic
-dist: trusty
-sudo: false
+language: nix
 
 env:
   matrix:
-    - EMACS_VERSION=emacs-24.4
-    - EMACS_VERSION=emacs-24.5
-    - EMACS_VERSION=emacs-25.1
-    - EMACS_VERSION=emacs-25.2
-    - EMACS_VERSION=emacs-25.3
-    - EMACS_VERSION=emacs-26.1
-    - EMACS_VERSION=emacs-26.2
-    - EMACS_VERSION=emacs-26.3
-    - EMACS_VERSION=emacs-git-snapshot
-    - EMACS_VERSION=remacs-git-snapshot
+    - EMACS_CI=emacs-24-4
+    - EMACS_CI=emacs-24-5
+    - EMACS_CI=emacs-25-1
+    - EMACS_CI=emacs-25-2
+    - EMACS_CI=emacs-25-3
+    - EMACS_CI=emacs-26-1
+    - EMACS_CI=emacs-26-2
+    - EMACS_CI=emacs-26-3
+    - EMACS_CI=emacs-snapshot
 
 matrix:
   allow_failures:
-  - env: EMACS_VERSION=remacs-git-snapshot
-  - env: EMACS_VERSION=emacs-git-snapshot
+  - env: EMACS_CI=emacs-snapshot
 
 before_script:
-  # Install evm
-  - git clone https://github.com/rejeep/evm.git ~/.evm
-  - export PATH="$HOME/.evm/bin:$PATH"
-  - evm config path /tmp
-  - evm list
-  # use this version of emacs for tests
-  - evm install "${EMACS_VERSION}-travis" --use --skip
-  - evm list
-  - emacs --version
+  # travis-wait-enhanced
+  - |
+    wget -qO- "https://github.com/crazy-max/travis-wait-enhanced/releases/download/v1.1.0/travis-wait-enhanced_1.1.0_linux_x86_64.tar.gz" | tar -zxvf - travis-wait-enhanced
+    mv travis-wait-enhanced /home/travis/bin/
+    travis-wait-enhanced --version
+  # Install nix-emacs-ci
+  - bash <(curl https://raw.githubusercontent.com/purcell/nix-emacs-ci/master/travis-install)
   # Install cask
   - curl -fsSkL https://raw.github.com/cask/cask/master/go | python
   - export PATH="$HOME/.cask/bin:$PATH"
@@ -37,12 +31,17 @@ before_script:
   - perl -ibak -lape 's{#!/usr/bin/env python}{#!/usr/bin/python}' "$(which cask)"
   # Check that cask is finding the right emacs
   - cask emacs --version
+  # Use version-specific Cask file if it exists
+  - if [ -e "Cask-$EMACS_CI" ]; then cp "Cask-$EMACS_CI" "Cask"; fi
   # Install elisp dependencies
   - cask install
 
 script:
-  - make compile
+  - travis-wait-enhanced --timeout=3m -- make compile
   # Don't send redundant coverage info
-  - UNDERCOVER_CONFIG='((:send-report nil))' make test
+  - UNDERCOVER_CONFIG='((:send-report nil))' travis-wait-enhanced --timeout=3m -- make test
   # For some reason emacs-git-snapshot hangs forever on this step
-  - if [ "$EMACS_VERSION" != emacs-git-snapshot ]; then make test-with-flx; fi
+  - |
+    if [ "$EMACS_CI" != emacs-snapshot ]; then
+      travis-wait-enhanced --timeout=3m -- make test-with-flx;
+    fi