From c7e95f40e13d8f341e6baa83432f4bd5f0844b95 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 31 Aug 2018 14:08:33 +0000
Subject: [PATCH 1/2] Revert "Travis: Mark all Linux builds as sudo-required as
 maven workaround"

This reverts commit ef608d2a167a64971d0e68748be14f2a61f26f52.
---
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 006d40a1451..2237bf724f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,7 +86,7 @@ jobs:
     # Ubuntu Linux with glibc using g++-5
     - stage: Linter + Doxygen + non-debug Ubuntu/gcc-5 test
       os: linux
-      sudo: true
+      sudo: false
       compiler: gcc
       cache: ccache
       addons:
@@ -121,7 +121,7 @@ jobs:
     # Ubuntu Linux with glibc using g++-5, debug mode
     - stage: Test different OS/CXX/Flags
       os: linux
-      sudo: true
+      sudo: false
       compiler: gcc
       cache: ccache
       addons:
@@ -207,7 +207,6 @@ jobs:
     # cmake build using g++-5
     - stage: Test different OS/CXX/Flags
       os: linux
-      sudo: true
       compiler: gcc
       cache: ccache
       env:
@@ -233,7 +232,6 @@ jobs:
     # cmake build using g++-7
     - stage: Test different OS/CXX/Flags
       os: linux
-      sudo: true
       compiler: gcc
       cache: ccache
       env:
@@ -259,7 +257,6 @@ jobs:
     # cmake build using clang++-6
     - stage: Test different OS/CXX/Flags
       os: linux
-      sudo: true
       compiler: clang
       cache: ccache
       env:
@@ -314,7 +311,7 @@ jobs:
     - stage: Test different OS/CXX/Flags
       if: type = cron
       os: linux
-      sudo: true
+      sudo: false
       compiler: gcc
       cache: ccache
       addons:

From 1093b14e648e5cdc208356ae4a805cc0a5cb45f7 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 31 Aug 2018 14:08:43 +0000
Subject: [PATCH 2/2] Revert "Try to fix travis failure on doxygen stage"

This reverts commit 1cb6c9b2d06e9eae48c940b300d32c37953977d6.
---
 .travis.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2237bf724f9..b11be4cc262 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,14 +49,18 @@ jobs:
       env:
         NAME: "DOXYGEN-CHECK"
         DOXYGEN_VERSION: "1.8.14"
+      addons:
+        apt:
+          sources:
+            - sourceline: 'deb http://packages.cloud.google.com/apt cloud-sdk-trusty main'
+              key_url: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg'
+          packages:
+            - cmake
+            - google-cloud-sdk
+            - graphviz
       cache:
         directories:
           - ${TRAVIS_BUILD_DIR}/doxygen/build/bin
-      before_install:
-        - curl -sSL "https://packages.cloud.google.com/apt/doc/apt-key.gpg" | sudo -E apt-key add -
-        - echo "deb http://packages.cloud.google.com/apt cloud-sdk-trusty main" | sudo tee -a /etc/apt/sources.list > /dev/null
-        - sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
-        - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install cmake google-cloud-sdk graphviz
       install:
         - |
           # Build doxygen if it is not in Travis cache