From 602fbd4338a875aa26c6248338a3df97e08a6b72 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Sat, 31 Aug 2019 17:34:23 +0900
Subject: Limit the apt addon enablement to trusty

8897fa60fdbc83f9cce7df384893e902c17c1bf2 worked.
But we want to retry that part and this commit is trying to fix the
problem.
---
 .travis.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index df37d6a05d..6a90720184 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,11 +85,13 @@ env:
 
   - &gcc-8
     compiler: gcc-8
-    addons:
-      apt:
-        sources:
-          - ubuntu-toolchain-r-test
+    # # Not using addon to control retries
+    # addons:
+    #   apt:
+    #     sources:
+    #       - ubuntu-toolchain-r-test
     before_install:
+      - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
       - |-
         tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
@@ -350,6 +352,10 @@ env:
     dist: trusty # xenial no longer has ruby-1.9.3
     language: ruby
     rvm: 1.9.3
+    # For some reason, enabling apt addon seems to be required to pass `apt-get update` on trusty.
+    addons:
+      apt:
+        sources: []
 
   - &x86_64-darwin18
     name: x86_64-darwin18
-- 
cgit v1.2.1