From 696d83309831d58802c1ed2c4855bb6f86d96e66 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Thu, 4 Apr 2019 09:43:55 -0600
Subject: [PATCH] Allow shims back on the PATH.

The interpreter cache setup has since been made robust to interpreter
identification errors.
---
 .travis.yml                              | 158 +++++++++++------------
 build-support/bin/travis-ci.sh           |  58 ---------
 build-support/travis/travis.yml.mustache |  44 +++----
 3 files changed, 101 insertions(+), 159 deletions(-)
 delete mode 100755 build-support/bin/travis-ci.sh

diff --git a/.travis.yml b/.travis.yml
index 07f70425cc68..47d75b11746c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -438,7 +438,7 @@ py27_lint: &py27_lint
     - *py27_linux_test_config_env
     - CACHE_NAME=linuxselfchecks.py27
   script:
-    - ./build-support/bin/travis-ci.sh -fmrt2
+    - ./build-support/bin/ci.sh -fmrt2
 
 py36_lint: &py36_lint
   <<: *py36_linux_test_config
@@ -447,7 +447,7 @@ py36_lint: &py36_lint
     - *py36_linux_test_config_env
     - CACHE_NAME=linuxselfchecks.py36
   script:
-    - ./build-support/bin/travis-ci.sh -fmrt
+    - ./build-support/bin/ci.sh -fmrt
 
 py37_lint: &py37_lint
   <<: *py37_linux_test_config
@@ -456,7 +456,7 @@ py37_lint: &py37_lint
     - *py37_linux_test_config_env
     - CACHE_NAME=linuxselfchecks.py37
   script:
-    - ./build-support/bin/travis-ci.sh -fmrt7
+    - ./build-support/bin/ci.sh -fmrt7
 
 # -------------------------------------------------------------------------
 # Rust lints
@@ -476,7 +476,7 @@ linux_rust_clippy: &linux_rust_clippy
     - ulimit -c unlimited
     - ulimit -n 8192
   script:
-    - ./build-support/bin/travis-ci.sh -s
+    - ./build-support/bin/ci.sh -s
 
 cargo_audit: &cargo_audit
   <<: *base_rust_lints
@@ -485,7 +485,7 @@ cargo_audit: &cargo_audit
     - CACHE_NAME=linuxcargoaudit
   stage: *test_cron
   script:
-    - ./build-support/bin/travis-ci.sh -a
+    - ./build-support/bin/ci.sh -a
 
 # -------------------------------------------------------------------------
 # Build wheels
@@ -629,7 +629,7 @@ base_rust_tests: &base_rust_tests
     - ulimit -c unlimited
     - ulimit -n 8192
   script:
-    - ./build-support/bin/travis-ci.sh -e
+    - ./build-support/bin/ci.sh -e
 
 linux_rust_tests: &linux_rust_tests
   <<: *base_rust_tests
@@ -664,7 +664,7 @@ osx_rust_tests: &osx_rust_tests
 
 base_osx_sanity_check: &base_osx_sanity_check
   script:
-    - MODE=debug ./build-support/bin/travis-ci.sh -m
+    - MODE=debug ./build-support/bin/ci.sh -m
 
 # TODO: Update this to use 10.14 once it is available
 base_osx_10_12_sanity_check: &base_osx_10_12_sanity_check
@@ -734,7 +734,7 @@ py27_osx_platform_tests: &py27_osx_platform_tests
     - *py27_osx_test_config_env
     - CACHE_NAME=macosplatformtests.py27
   script:
-    - ./build-support/bin/travis-ci.sh -z2
+    - ./build-support/bin/ci.sh -z2
 
 py36_osx_platform_tests: &py36_osx_platform_tests
   <<: *py36_osx_test_config
@@ -743,7 +743,7 @@ py36_osx_platform_tests: &py36_osx_platform_tests
     - *py36_osx_test_config_env
     - CACHE_NAME=macosplatformtests.py36
   script:
-    - ./build-support/bin/travis-ci.sh -z
+    - ./build-support/bin/ci.sh -z
 
 py37_osx_platform_tests: &py37_osx_platform_tests
   <<: *py37_osx_test_config
@@ -752,7 +752,7 @@ py37_osx_platform_tests: &py37_osx_platform_tests
     - *py37_osx_test_config_env
     - CACHE_NAME=macosplatformtests.py37
   script:
-    - ./build-support/bin/travis-ci.sh -z7
+    - ./build-support/bin/ci.sh -z7
 
 # -------------------------------------------------------------------------
 # JVM tests
@@ -769,7 +769,7 @@ py27_jvm_tests: &py27_jvm_tests
     - *py27_linux_test_config_env
     - CACHE_NAME=linuxjvmtests.py27
   script:
-    - ./build-support/bin/travis-ci.sh -j2
+    - ./build-support/bin/ci.sh -j2
 
 py36_jvm_tests: &py36_jvm_tests
   <<: *py36_linux_test_config
@@ -779,7 +779,7 @@ py36_jvm_tests: &py36_jvm_tests
     - *py36_linux_test_config_env
     - CACHE_NAME=linuxjvmtests.py36
   script:
-    - ./build-support/bin/travis-ci.sh -j
+    - ./build-support/bin/ci.sh -j
 
 py37_jvm_tests: &py37_jvm_tests
   <<: *py37_linux_test_config
@@ -789,7 +789,7 @@ py37_jvm_tests: &py37_jvm_tests
     - *py37_linux_test_config_env
     - CACHE_NAME=linuxjvmtests.py37
   script:
-    - ./build-support/bin/travis-ci.sh -j7
+    - ./build-support/bin/ci.sh -j7
 
 # -------------------------------------------------------------------------
 # Deploy
@@ -906,7 +906,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=linuxunittests.py27
       script:
-        - ./build-support/bin/travis-ci.sh -2lp
+        - ./build-support/bin/ci.sh -2lp
 
     - <<: *py36_linux_test_config
       name: "Unit tests (Py3.6 PEX)"
@@ -914,7 +914,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=linuxunittests.py36
       script:
-        - ./build-support/bin/travis-ci.sh -lp
+        - ./build-support/bin/ci.sh -lp
 
     - <<: *py37_linux_test_config
       name: "Unit tests (Py3.7 PEX)"
@@ -922,7 +922,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=linuxunittests.py37
       script:
-        - ./build-support/bin/travis-ci.sh -7lp
+        - ./build-support/bin/ci.sh -7lp
 
     - <<: *py27_linux_build_wheels_ucs2
     - <<: *py27_linux_build_wheels_ucs4
@@ -938,7 +938,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard0
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 0/20
+        - ./build-support/bin/ci.sh -c -i 0/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 1 (Py3.6 PEX)"
@@ -946,7 +946,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard1
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 1/20
+        - ./build-support/bin/ci.sh -c -i 1/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 2 (Py3.6 PEX)"
@@ -954,7 +954,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard2
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 2/20
+        - ./build-support/bin/ci.sh -c -i 2/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 3 (Py3.6 PEX)"
@@ -962,7 +962,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard3
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 3/20
+        - ./build-support/bin/ci.sh -c -i 3/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 4 (Py3.6 PEX)"
@@ -970,7 +970,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard4
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 4/20
+        - ./build-support/bin/ci.sh -c -i 4/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 5 (Py3.6 PEX)"
@@ -978,7 +978,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard5
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 5/20
+        - ./build-support/bin/ci.sh -c -i 5/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 6 (Py3.6 PEX)"
@@ -986,7 +986,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard6
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 6/20
+        - ./build-support/bin/ci.sh -c -i 6/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 7 (Py3.6 PEX)"
@@ -994,7 +994,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard7
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 7/20
+        - ./build-support/bin/ci.sh -c -i 7/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 8 (Py3.6 PEX)"
@@ -1002,7 +1002,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard8
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 8/20
+        - ./build-support/bin/ci.sh -c -i 8/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 9 (Py3.6 PEX)"
@@ -1010,7 +1010,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard9
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 9/20
+        - ./build-support/bin/ci.sh -c -i 9/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 10 (Py3.6 PEX)"
@@ -1018,7 +1018,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard10
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 10/20
+        - ./build-support/bin/ci.sh -c -i 10/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 11 (Py3.6 PEX)"
@@ -1026,7 +1026,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard11
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 11/20
+        - ./build-support/bin/ci.sh -c -i 11/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 12 (Py3.6 PEX)"
@@ -1034,7 +1034,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard12
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 12/20
+        - ./build-support/bin/ci.sh -c -i 12/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 13 (Py3.6 PEX)"
@@ -1042,7 +1042,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard13
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 13/20
+        - ./build-support/bin/ci.sh -c -i 13/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 14 (Py3.6 PEX)"
@@ -1050,7 +1050,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard14
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 14/20
+        - ./build-support/bin/ci.sh -c -i 14/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 15 (Py3.6 PEX)"
@@ -1058,7 +1058,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard15
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 15/20
+        - ./build-support/bin/ci.sh -c -i 15/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 16 (Py3.6 PEX)"
@@ -1066,7 +1066,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard16
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 16/20
+        - ./build-support/bin/ci.sh -c -i 16/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 17 (Py3.6 PEX)"
@@ -1074,7 +1074,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard17
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 17/20
+        - ./build-support/bin/ci.sh -c -i 17/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 18 (Py3.6 PEX)"
@@ -1082,7 +1082,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard18
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 18/20
+        - ./build-support/bin/ci.sh -c -i 18/20
 
     - <<: *py36_linux_test_config
       name: "Integration tests - shard 19 (Py3.6 PEX)"
@@ -1090,7 +1090,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard19
       script:
-        - ./build-support/bin/travis-ci.sh -c -i 19/20
+        - ./build-support/bin/ci.sh -c -i 19/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 0 (Py3.7 PEX)"
@@ -1098,7 +1098,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard0
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 0/20
+        - ./build-support/bin/ci.sh -c7 -i 0/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 1 (Py3.7 PEX)"
@@ -1106,7 +1106,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard1
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 1/20
+        - ./build-support/bin/ci.sh -c7 -i 1/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 2 (Py3.7 PEX)"
@@ -1114,7 +1114,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard2
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 2/20
+        - ./build-support/bin/ci.sh -c7 -i 2/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 3 (Py3.7 PEX)"
@@ -1122,7 +1122,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard3
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 3/20
+        - ./build-support/bin/ci.sh -c7 -i 3/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 4 (Py3.7 PEX)"
@@ -1130,7 +1130,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard4
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 4/20
+        - ./build-support/bin/ci.sh -c7 -i 4/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 5 (Py3.7 PEX)"
@@ -1138,7 +1138,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard5
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 5/20
+        - ./build-support/bin/ci.sh -c7 -i 5/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 6 (Py3.7 PEX)"
@@ -1146,7 +1146,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard6
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 6/20
+        - ./build-support/bin/ci.sh -c7 -i 6/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 7 (Py3.7 PEX)"
@@ -1154,7 +1154,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard7
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 7/20
+        - ./build-support/bin/ci.sh -c7 -i 7/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 8 (Py3.7 PEX)"
@@ -1162,7 +1162,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard8
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 8/20
+        - ./build-support/bin/ci.sh -c7 -i 8/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 9 (Py3.7 PEX)"
@@ -1170,7 +1170,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard9
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 9/20
+        - ./build-support/bin/ci.sh -c7 -i 9/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 10 (Py3.7 PEX)"
@@ -1178,7 +1178,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard10
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 10/20
+        - ./build-support/bin/ci.sh -c7 -i 10/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 11 (Py3.7 PEX)"
@@ -1186,7 +1186,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard11
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 11/20
+        - ./build-support/bin/ci.sh -c7 -i 11/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 12 (Py3.7 PEX)"
@@ -1194,7 +1194,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard12
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 12/20
+        - ./build-support/bin/ci.sh -c7 -i 12/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 13 (Py3.7 PEX)"
@@ -1202,7 +1202,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard13
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 13/20
+        - ./build-support/bin/ci.sh -c7 -i 13/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 14 (Py3.7 PEX)"
@@ -1210,7 +1210,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard14
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 14/20
+        - ./build-support/bin/ci.sh -c7 -i 14/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 15 (Py3.7 PEX)"
@@ -1218,7 +1218,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard15
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 15/20
+        - ./build-support/bin/ci.sh -c7 -i 15/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 16 (Py3.7 PEX)"
@@ -1226,7 +1226,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard16
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 16/20
+        - ./build-support/bin/ci.sh -c7 -i 16/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 17 (Py3.7 PEX)"
@@ -1234,7 +1234,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard17
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 17/20
+        - ./build-support/bin/ci.sh -c7 -i 17/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 18 (Py3.7 PEX)"
@@ -1242,7 +1242,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard18
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 18/20
+        - ./build-support/bin/ci.sh -c7 -i 18/20
 
     - <<: *py37_linux_test_config
       name: "Integration tests - shard 19 (Py3.7 PEX)"
@@ -1250,7 +1250,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard19
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i 19/20
+        - ./build-support/bin/ci.sh -c7 -i 19/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 0 (Py2.7 PEX)"
@@ -1258,7 +1258,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard0
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 0/20
+        - ./build-support/bin/ci.sh -c2 -i 0/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 1 (Py2.7 PEX)"
@@ -1266,7 +1266,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard1
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 1/20
+        - ./build-support/bin/ci.sh -c2 -i 1/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 2 (Py2.7 PEX)"
@@ -1274,7 +1274,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard2
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 2/20
+        - ./build-support/bin/ci.sh -c2 -i 2/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 3 (Py2.7 PEX)"
@@ -1282,7 +1282,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard3
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 3/20
+        - ./build-support/bin/ci.sh -c2 -i 3/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 4 (Py2.7 PEX)"
@@ -1290,7 +1290,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard4
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 4/20
+        - ./build-support/bin/ci.sh -c2 -i 4/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 5 (Py2.7 PEX)"
@@ -1298,7 +1298,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard5
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 5/20
+        - ./build-support/bin/ci.sh -c2 -i 5/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 6 (Py2.7 PEX)"
@@ -1306,7 +1306,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard6
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 6/20
+        - ./build-support/bin/ci.sh -c2 -i 6/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 7 (Py2.7 PEX)"
@@ -1314,7 +1314,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard7
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 7/20
+        - ./build-support/bin/ci.sh -c2 -i 7/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 8 (Py2.7 PEX)"
@@ -1322,7 +1322,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard8
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 8/20
+        - ./build-support/bin/ci.sh -c2 -i 8/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 9 (Py2.7 PEX)"
@@ -1330,7 +1330,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard9
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 9/20
+        - ./build-support/bin/ci.sh -c2 -i 9/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 10 (Py2.7 PEX)"
@@ -1338,7 +1338,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard10
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 10/20
+        - ./build-support/bin/ci.sh -c2 -i 10/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 11 (Py2.7 PEX)"
@@ -1346,7 +1346,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard11
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 11/20
+        - ./build-support/bin/ci.sh -c2 -i 11/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 12 (Py2.7 PEX)"
@@ -1354,7 +1354,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard12
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 12/20
+        - ./build-support/bin/ci.sh -c2 -i 12/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 13 (Py2.7 PEX)"
@@ -1362,7 +1362,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard13
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 13/20
+        - ./build-support/bin/ci.sh -c2 -i 13/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 14 (Py2.7 PEX)"
@@ -1370,7 +1370,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard14
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 14/20
+        - ./build-support/bin/ci.sh -c2 -i 14/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 15 (Py2.7 PEX)"
@@ -1378,7 +1378,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard15
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 15/20
+        - ./build-support/bin/ci.sh -c2 -i 15/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 16 (Py2.7 PEX)"
@@ -1386,7 +1386,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard16
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 16/20
+        - ./build-support/bin/ci.sh -c2 -i 16/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 17 (Py2.7 PEX)"
@@ -1394,7 +1394,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard17
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 17/20
+        - ./build-support/bin/ci.sh -c2 -i 17/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 18 (Py2.7 PEX)"
@@ -1402,7 +1402,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard18
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 18/20
+        - ./build-support/bin/ci.sh -c2 -i 18/20
 
     - <<: *py27_linux_test_config
       name: "Integration tests - shard 19 (Py2.7 PEX)"
@@ -1410,7 +1410,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard19
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i 19/20
+        - ./build-support/bin/ci.sh -c2 -i 19/20
 
 
     - <<: *linux_rust_tests
@@ -1423,7 +1423,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=linuxcontribtests.py27
       script:
-        - ./build-support/bin/travis-ci.sh -2n
+        - ./build-support/bin/ci.sh -2n
 
     - <<: *py36_linux_test_config
       name: "Python contrib tests (Py3.6 PEX)"
@@ -1431,7 +1431,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=linuxcontribtests.py36
       script:
-        - ./build-support/bin/travis-ci.sh -n
+        - ./build-support/bin/ci.sh -n
 
     - <<: *py37_linux_test_config
       name: "Python contrib tests (Py3.7 PEX)"
@@ -1439,7 +1439,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=linuxcontribtests.py37
       script:
-        - ./build-support/bin/travis-ci.sh -7n
+        - ./build-support/bin/ci.sh -7n
 
     - <<: *py27_osx_10_12_sanity_check
     - <<: *py36_osx_10_12_sanity_check
diff --git a/build-support/bin/travis-ci.sh b/build-support/bin/travis-ci.sh
deleted file mode 100755
index 881b3fab51b2..000000000000
--- a/build-support/bin/travis-ci.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2018 Pants project contributors (see CONTRIBUTORS.md).
-# Licensed under the Apache License, Version 2.0 (see LICENSE).
-
-# TravisCI-specific environment fixups can live in this script which forwards to the generic ci
-# script post fixups.
-
-set -euo pipefail
-
-cd "$(git rev-parse --show-toplevel)"
-
-export RUNNING_VIA_TRAVIS_CI_SCRIPT=1
-
-PYENV="$(which pyenv 2>/dev/null)"
-PYENV_ROOT="$(pyenv root 2>/dev/null || true)"
-
-function pyenv_path {
-  "${PYENV}" versions --bare --skip-aliases | while read v; do
-    echo "${PYENV_ROOT}/versions/${v}/bin"
-  done
-}
-
-function list_pythons {
-  which -a python{,2,3} | sort -u | while read python_bin; do
-    ${python_bin} <<EOF
-import os
-import sys
-
-print('{} -> {}'.format(os.path.realpath(sys.executable),
-                        '.'.join(map(str, sys.version_info[:3]))))
-EOF
-  done
-}
-
-# TravisCI uses pyenv to provide some interpreters pre-installed for images. Unfortunately it places
-# `~/.pyenv/shims` on the PATH and these shims are broken (see:
-# https://github.com/travis-ci/travis-ci/issues/8363). We work around this by placing
-# removing shims from the PATH and adding `~/.pyenv/versions/<version>/bin`.
-if [ -n "${PYENV}" ]; then
-  PYENV_PYTHONS="$(pyenv_path)"
-  PYENV_PATH="$(echo ${PYENV_PYTHONS} | tr ' ' ':')"
-
-  SHIMLESS_PATH="$(echo "${PATH}" | tr : '\n' | grep -v "${PYENV_ROOT}/shims")"
-  PATH="$(echo ${SHIMLESS_PATH} | tr ' ' ':')"
-
-  export PATH="${PYENV_PATH}:${PATH}"
-
-cat <<EOF
-Executing ./build-support/bin/ci.sh "$@" with "${PYENV_PATH}" preprended to the PATH
-and "${PYENV_ROOT}/shims" removed from the PATH.
-
-Visible pythons are now:
-$(list_pythons | sort -u)
-
-EOF
-fi
-
-exec ./build-support/bin/ci.sh "$@"
diff --git a/build-support/travis/travis.yml.mustache b/build-support/travis/travis.yml.mustache
index 5a14c1ece0e9..efe7359f1e06 100644
--- a/build-support/travis/travis.yml.mustache
+++ b/build-support/travis/travis.yml.mustache
@@ -396,7 +396,7 @@ py27_lint: &py27_lint
     - *py27_linux_test_config_env
     - CACHE_NAME=linuxselfchecks.py27
   script:
-    - ./build-support/bin/travis-ci.sh -fmrt2
+    - ./build-support/bin/ci.sh -fmrt2
 
 py36_lint: &py36_lint
   <<: *py36_linux_test_config
@@ -405,7 +405,7 @@ py36_lint: &py36_lint
     - *py36_linux_test_config_env
     - CACHE_NAME=linuxselfchecks.py36
   script:
-    - ./build-support/bin/travis-ci.sh -fmrt
+    - ./build-support/bin/ci.sh -fmrt
 
 py37_lint: &py37_lint
   <<: *py37_linux_test_config
@@ -414,7 +414,7 @@ py37_lint: &py37_lint
     - *py37_linux_test_config_env
     - CACHE_NAME=linuxselfchecks.py37
   script:
-    - ./build-support/bin/travis-ci.sh -fmrt7
+    - ./build-support/bin/ci.sh -fmrt7
 
 # -------------------------------------------------------------------------
 # Rust lints
@@ -434,7 +434,7 @@ linux_rust_clippy: &linux_rust_clippy
     - ulimit -c unlimited
     - ulimit -n 8192
   script:
-    - ./build-support/bin/travis-ci.sh -s
+    - ./build-support/bin/ci.sh -s
 
 cargo_audit: &cargo_audit
   <<: *base_rust_lints
@@ -443,7 +443,7 @@ cargo_audit: &cargo_audit
     - CACHE_NAME=linuxcargoaudit
   stage: *test_cron
   script:
-    - ./build-support/bin/travis-ci.sh -a
+    - ./build-support/bin/ci.sh -a
 
 # -------------------------------------------------------------------------
 # Build wheels
@@ -574,7 +574,7 @@ base_rust_tests: &base_rust_tests
     - ulimit -c unlimited
     - ulimit -n 8192
   script:
-    - ./build-support/bin/travis-ci.sh -e
+    - ./build-support/bin/ci.sh -e
 
 linux_rust_tests: &linux_rust_tests
   <<: *base_rust_tests
@@ -607,7 +607,7 @@ osx_rust_tests: &osx_rust_tests
 
 base_osx_sanity_check: &base_osx_sanity_check
   script:
-    - MODE=debug ./build-support/bin/travis-ci.sh -m
+    - MODE=debug ./build-support/bin/ci.sh -m
 
 # TODO: Update this to use 10.14 once it is available
 base_osx_10_12_sanity_check: &base_osx_10_12_sanity_check
@@ -677,7 +677,7 @@ py27_osx_platform_tests: &py27_osx_platform_tests
     - *py27_osx_test_config_env
     - CACHE_NAME=macosplatformtests.py27
   script:
-    - ./build-support/bin/travis-ci.sh -z2
+    - ./build-support/bin/ci.sh -z2
 
 py36_osx_platform_tests: &py36_osx_platform_tests
   <<: *py36_osx_test_config
@@ -686,7 +686,7 @@ py36_osx_platform_tests: &py36_osx_platform_tests
     - *py36_osx_test_config_env
     - CACHE_NAME=macosplatformtests.py36
   script:
-    - ./build-support/bin/travis-ci.sh -z
+    - ./build-support/bin/ci.sh -z
 
 py37_osx_platform_tests: &py37_osx_platform_tests
   <<: *py37_osx_test_config
@@ -695,7 +695,7 @@ py37_osx_platform_tests: &py37_osx_platform_tests
     - *py37_osx_test_config_env
     - CACHE_NAME=macosplatformtests.py37
   script:
-    - ./build-support/bin/travis-ci.sh -z7
+    - ./build-support/bin/ci.sh -z7
 
 # -------------------------------------------------------------------------
 # JVM tests
@@ -712,7 +712,7 @@ py27_jvm_tests: &py27_jvm_tests
     - *py27_linux_test_config_env
     - CACHE_NAME=linuxjvmtests.py27
   script:
-    - ./build-support/bin/travis-ci.sh -j2
+    - ./build-support/bin/ci.sh -j2
 
 py36_jvm_tests: &py36_jvm_tests
   <<: *py36_linux_test_config
@@ -722,7 +722,7 @@ py36_jvm_tests: &py36_jvm_tests
     - *py36_linux_test_config_env
     - CACHE_NAME=linuxjvmtests.py36
   script:
-    - ./build-support/bin/travis-ci.sh -j
+    - ./build-support/bin/ci.sh -j
 
 py37_jvm_tests: &py37_jvm_tests
   <<: *py37_linux_test_config
@@ -732,7 +732,7 @@ py37_jvm_tests: &py37_jvm_tests
     - *py37_linux_test_config_env
     - CACHE_NAME=linuxjvmtests.py37
   script:
-    - ./build-support/bin/travis-ci.sh -j7
+    - ./build-support/bin/ci.sh -j7
 
 # -------------------------------------------------------------------------
 # Deploy
@@ -849,7 +849,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=linuxunittests.py27
       script:
-        - ./build-support/bin/travis-ci.sh -2lp
+        - ./build-support/bin/ci.sh -2lp
 
     - <<: *py36_linux_test_config
       name: "Unit tests (Py3.6 PEX)"
@@ -857,7 +857,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=linuxunittests.py36
       script:
-        - ./build-support/bin/travis-ci.sh -lp
+        - ./build-support/bin/ci.sh -lp
 
     - <<: *py37_linux_test_config
       name: "Unit tests (Py3.7 PEX)"
@@ -865,7 +865,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=linuxunittests.py37
       script:
-        - ./build-support/bin/travis-ci.sh -7lp
+        - ./build-support/bin/ci.sh -7lp
 
     - <<: *py27_linux_build_wheels_ucs2
     - <<: *py27_linux_build_wheels_ucs4
@@ -882,7 +882,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=integrationshard{{.}}
       script:
-        - ./build-support/bin/travis-ci.sh -c -i {{.}}/{{integration_shards_length}}
+        - ./build-support/bin/ci.sh -c -i {{.}}/{{integration_shards_length}}
 
 {{/integration_shards}}
 {{#integration_shards}}
@@ -892,7 +892,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=integrationshard{{.}}
       script:
-        - ./build-support/bin/travis-ci.sh -c7 -i {{.}}/{{integration_shards_length}}
+        - ./build-support/bin/ci.sh -c7 -i {{.}}/{{integration_shards_length}}
 
 {{/integration_shards}}
 {{#integration_shards}}
@@ -902,7 +902,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=cronshard{{.}}
       script:
-        - ./build-support/bin/travis-ci.sh -c2 -i {{.}}/{{integration_shards_length}}
+        - ./build-support/bin/ci.sh -c2 -i {{.}}/{{integration_shards_length}}
 
 {{/integration_shards}}
 
@@ -916,7 +916,7 @@ matrix:
         - *py27_linux_test_config_env
         - CACHE_NAME=linuxcontribtests.py27
       script:
-        - ./build-support/bin/travis-ci.sh -2n
+        - ./build-support/bin/ci.sh -2n
 
     - <<: *py36_linux_test_config
       name: "Python contrib tests (Py3.6 PEX)"
@@ -924,7 +924,7 @@ matrix:
         - *py36_linux_test_config_env
         - CACHE_NAME=linuxcontribtests.py36
       script:
-        - ./build-support/bin/travis-ci.sh -n
+        - ./build-support/bin/ci.sh -n
 
     - <<: *py37_linux_test_config
       name: "Python contrib tests (Py3.7 PEX)"
@@ -932,7 +932,7 @@ matrix:
         - *py37_linux_test_config_env
         - CACHE_NAME=linuxcontribtests.py37
       script:
-        - ./build-support/bin/travis-ci.sh -7n
+        - ./build-support/bin/ci.sh -7n
 
     - <<: *py27_osx_10_12_sanity_check
     - <<: *py36_osx_10_12_sanity_check