From 3f01342b07b93ac4a141397f9ed16b53de4dd498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 10 Jul 2018 17:06:43 +0200
Subject: [PATCH 1/3] WIP Re-enable shell completion tests via tmux

---
 .travis.yml      |  4 ++++
 script/bootstrap | 13 -------------
 script/ruby-test |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b879a7ad6..482da4d1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ go:
   - 1.8.x
 script: make test-all
 install: script/bootstrap
+addons:
+  apt:
+    packages:
+      - tmux
 after_success: script/publish-release
 env:
   global:
diff --git a/script/bootstrap b/script/bootstrap
index 6ee54ce06..8409e0703 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -3,19 +3,6 @@ set -e
 
 STATUS=0
 
-if [ -n "$TRAVIS" ] && [ ! -x ~/bin/tmux ]; then
-  case "$TRAVIS_OS_NAME" in
-    linux ) cache_name="tmux-zsh.ubuntu" ;;
-    osx ) cache_name="tmux.osx" ;;
-    * )
-      echo "unknown OS: $TRAVIS_OS_NAME" >&2
-      exit 1
-      ;;
-  esac
-
-  curl -fsSL "https://${AMAZON_S3_BUCKET}.s3.amazonaws.com/${cache_name}.tgz" | tar -xz -C ~
-fi
-
 { ruby --version
   if [ -n "$TRAVIS" ]; then
     script/cached-bundle install --deployment --jobs=3 --retry=3 --path bundle
diff --git a/script/ruby-test b/script/ruby-test
index 01df6d478..00ab83df9 100755
--- a/script/ruby-test
+++ b/script/ruby-test
@@ -21,7 +21,7 @@ check_warnings() {
   fi
 }
 
-if [ -z "$TRAVIS" ] && tmux -V; then
+if tmux -V; then
   if [ -n "$CI" ]; then
     git --version
     bash --version | head -1

From f76922cd1cbdc83385a88475cbfb025ec2fe252a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 10 Jul 2018 17:10:42 +0200
Subject: [PATCH 2/3] Add zsh, fish to Travis CI

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 482da4d1f..5732a5eda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ addons:
   apt:
     packages:
       - tmux
+      - zsh
+      - fish
 after_success: script/publish-release
 env:
   global:

From 7a00a430abcc427712e0ae722de4b9726c184bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Tue, 10 Jul 2018 17:23:23 +0200
Subject: [PATCH 3/3] Try to install newer fish

---
 .travis.yml      | 2 ++
 script/ruby-test | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5732a5eda..596875675 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ script: make test-all
 install: script/bootstrap
 addons:
   apt:
+    sources:
+      - sourceline: 'ppa:fish-shell/release-2'
     packages:
       - tmux
       - zsh
diff --git a/script/ruby-test b/script/ruby-test
index 00ab83df9..ebb240019 100755
--- a/script/ruby-test
+++ b/script/ruby-test
@@ -26,6 +26,7 @@ if tmux -V; then
     git --version
     bash --version | head -1
     zsh --version
+    fish --version
     echo
   fi
   profile="all"