[elpa] externals/ssh-deploy 3223f69 094/133: Updated Travis file

[Stefan Monnier]

branch: externals/ssh-deploy
commit 3223f6933f11d29d8a97f6648d7e3f10e891e04b
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Updated Travis file
---
 .travis.yml        | 32 +++++++++++++++++++++++++++++---
 ssh-deploy-test.el |  6 +++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 667722e..268ed75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,35 @@
 language: emacs-lisp
+# Emacs fails to build in container-based builds on Travis
+# See https://github.com/travis-ci/travis-ci/issues/9061
+# and https://github.com/moby/moby/issues/22801
 sudo: required
+dist: trusty
+cache:
+  - directories:
+      # Cache stable Emacs binaries (saves 1min per job)
+      - "$HOME/emacs/"
+# Allow Emacs snapshot builds to fail and don’t wait for these as they can take
+# a looooong time
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: EMACS_VERSION=snapshot
 env:
-  matrix:
-    - EMACS_VERSION=emacs-25
-
+  - EMACS_VERSION=25.3
+  - EMACS_VERSION=snapshot
+before_install:
+  # Configure $PATH: Executables are installed to $HOME/bin
+  - export PATH="$HOME/bin:$PATH"
+  # Download the makefile to emacs-travis.mk
+  - wget 
'https://raw.githubusercontent.com/flycheck/emacs-travis/master/emacs-travis.mk'
+  # Install Emacs (according to $EMACS_VERSION) and Cask
+  - make -f emacs-travis.mk install_emacs
+  - make -f emacs-travis.mk install_cask
+  # Install Texinfo, if you need to build info manuals for your project
+  - make -f emacs-travis.mk install_texinfo
+install:
+  # Install your dependencies
+  - cask install
 script:
   # Make sure the exact emacs version can be found in the build output.
   - emacs -Q --batch --eval '(message (emacs-version))'
diff --git a/ssh-deploy-test.el b/ssh-deploy-test.el
index 93405e6..3fac61b 100644
--- a/ssh-deploy-test.el
+++ b/ssh-deploy-test.el
@@ -363,11 +363,15 @@
   (let ((ssh-deploy-verbose 1)
         (ssh-deploy-debug 1)
         ;; (debug-on-error t)
-        (async-threads (fboundp 'make-thread'))
+        (async-threads (fboundp 'make-thread))
         (async-el (fboundp 'async-start))
         (ssh-deploy-revision-folder (file-truename (expand-file-name 
"revisions"))))
     (when (and ssh-deploy-verbose
                ssh-deploy-debug)
+
+      (if async-threads
+          (message "\nNOTE: Running tests for asynchronous threads as well 
since it's loaded\n")
+        (message "\nNOTE: Skipping tests for asynchronous threads since it's 
not loaded\n"))
       
       (if async-el
           (message "\nNOTE: Running tests for async.el as well since it's 
loaded\n")