From 85523e61a780cb2c54f4bdabbfaa60cb14244f6b Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 8 Aug 2016 02:48:22 -0400
Subject: [PATCH] Use unbranded builds for 'release' and 'beta' on Travis

---
 .travis.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68d9912136..61b9205c8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@ language: cpp
 compiler:
     - gcc
 env:
-    - FX_CHANNEL=""
-    - FX_CHANNEL="-esr"
-    - FX_CHANNEL="-beta"
+    - FX_CHANNEL="release"
+    - FX_CHANNEL="beta"
+    - FX_CHANNEL="esr"
 matrix:
     fast_finish: true
     allow_failures:
@@ -13,7 +13,14 @@ matrix:
 notifications:
     email: false
 install:
-    - wget -O tarball "https://download.mozilla.org/?product=firefox${FX_CHANNEL}-latest&os=linux64&lang=en-US"
+    # Use unbranded builds for 'release' and 'beta'
+    - test $FX_CHANNEL != "esr" \
+        && TS="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/ | grep mozilla-$FX_CHANNEL | tail -n 1 | sed -r 's/.+add-on-devel\/([0-9]+).+/\1/'`" \
+        && FN="`curl -s https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/ | grep add-on-devel.tar.bz2 | head -n 1 | sed -r 's/.+>(firefox-[^<]+).+/\1/g'`" \
+        && wget -O tarball "https://archive.mozilla.org/pub/firefox/tinderbox-builds/mozilla-${FX_CHANNEL}-linux64-add-on-devel/$TS/$FN"
+    # Use official build for 'esr'
+    - test $FX_CHANNEL == "esr"
+        && wget -O tarball "https://download.mozilla.org/?product=firefox${FX_CHANNEL}-latest&os=linux64&lang=en-US"
     - tar xf tarball
 before_script:
     - export DISPLAY=:99.0