Merge pull request #155 from infosiftr/pgp-happy-eyeballs

Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues
redis · Jul 30, 2018 · 400cbe7 · 400cbe7
2 parents 8007e7e + 26adecc
commit 400cbe7
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,12 +17,18 @@ install:
 
 before_script:
   - env | sort
+  - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
   - cd "$VERSION"
   - image="redis:${VERSION}${VARIANT:+-$VARIANT}"
 
 script:
-  - travis_retry docker build -t "$image" "${VARIANT:-.}"
-  - ~/official-images/test/run.sh "$image"
+  - |
+    (
+      set -Eeuo pipefail
+      set -x
+      docker build -t "$image" .
+      ~/official-images/test/run.sh "$image"
+    )
 
 after_script:
   - docker images