From 0ab7cfa78be0e63d3a512d6d1f62d7a9ece6c104 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 14 Nov 2019 20:05:42 -0500
Subject: [PATCH 1/4] Add big-endian, s390x job to Travis

This will help catch issues like #11388.

[skip appveyor]
---
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 85eca601a3..9d7042ffbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,7 +77,6 @@ addons:
       - gdb
       - gperf
       - language-pack-tr
-      - libc6-dev-i386
       - libtool-bin
       - locales
       - ninja-build
@@ -160,6 +159,14 @@ jobs:
         # Minimum required CMake.
         - CMAKE_URL=https://cmake.org/files/v2.8/cmake-2.8.12-Linux-i386.sh
         - *common-job-env
+    - name: big-endian
+      os: linux
+      arch: s390x
+      compiler: gcc
+      env:
+        - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
+        - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
+        - *common-job-env
     - name: clang-tsan
       os: linux
       compiler: clang

From cca301d93974ddfb3eae749799f7675be3a2b6b5 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 18 Mar 2020 22:38:31 -0400
Subject: [PATCH 2/4] Install pynvim with --user to avoid permission issues

[skip appveyor]
---
 .travis.yml   | 10 ++++++++++
 ci/install.sh |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9d7042ffbc..9865d4b186 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -167,6 +167,16 @@ jobs:
         - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
         - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
         - *common-job-env
+      addons:
+        apt:
+          packages:
+            - *common-apt-packages
+            - python-pip
+            - python3-pip
+            - python-setuptools
+            - python3-setuptools
+            - python-dev
+            - python3-dev
     - name: clang-tsan
       os: linux
       compiler: clang
diff --git a/ci/install.sh b/ci/install.sh
index 769f00c5ba..a4dfc87a1b 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -14,9 +14,9 @@ fi
 
 # Use default CC to avoid compilation problems when installing Python modules.
 echo "Install neovim module for Python 3."
-CC=cc python3 -m pip -q install --upgrade pynvim
+CC=cc python3 -m pip -q install --user --upgrade pynvim
 echo "Install neovim module for Python 2."
-CC=cc python2 -m pip -q install --upgrade pynvim
+CC=cc python2 -m pip -q install --user --upgrade pynvim
 
 echo "Install neovim RubyGem."
 gem install --no-document --version ">= 0.8.0" neovim

From be7cefdc4fbd3da30356f252f94140c6949ae26b Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 18 Mar 2020 23:03:11 -0400
Subject: [PATCH 3/4] Set FUNCTIONALTEST=functionaltest-lua for s390x

LuaJIT doesn't support s390x yet.

[skip appveyor]
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9865d4b186..43c44fac54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -164,6 +164,7 @@ jobs:
       arch: s390x
       compiler: gcc
       env:
+        - FUNCTIONALTEST=functionaltest-lua
         - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
         - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
         - *common-job-env

From ca828eaed66af0592bcf606f08c8b2875b0e7c48 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 18 Mar 2020 23:07:40 -0400
Subject: [PATCH 4/4] Install gettext for msgfmt/msgmerge

[skip appveyor]
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 43c44fac54..b920f70f45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -172,6 +172,7 @@ jobs:
         apt:
           packages:
             - *common-apt-packages
+            - gettext
             - python-pip
             - python3-pip
             - python-setuptools