Skip to content

Commit d73d2db

Browse files
author
Daniel Kroening
authored
Merge pull request #2899 from tautschnig/revert-travis-sudo
Travis: revert sudo-workarounds
2 parents 78d811f + 1093b14 commit d73d2db

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

.travis.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,18 @@ jobs:
4949
env:
5050
NAME: "DOXYGEN-CHECK"
5151
DOXYGEN_VERSION: "1.8.14"
52+
addons:
53+
apt:
54+
sources:
55+
- sourceline: 'deb http://packages.cloud.google.com/apt cloud-sdk-trusty main'
56+
key_url: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg'
57+
packages:
58+
- cmake
59+
- google-cloud-sdk
60+
- graphviz
5261
cache:
5362
directories:
5463
- ${TRAVIS_BUILD_DIR}/doxygen/build/bin
55-
before_install:
56-
- curl -sSL "https://packages.cloud.google.com/apt/doc/apt-key.gpg" | sudo -E apt-key add -
57-
- echo "deb http://packages.cloud.google.com/apt cloud-sdk-trusty main" | sudo tee -a /etc/apt/sources.list > /dev/null
58-
- sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
59-
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install cmake google-cloud-sdk graphviz
6064
install:
6165
- |
6266
# Build doxygen if it is not in Travis cache
@@ -86,7 +90,7 @@ jobs:
8690
# Ubuntu Linux with glibc using g++-5
8791
- stage: Linter + Doxygen + non-debug Ubuntu/gcc-5 test
8892
os: linux
89-
sudo: true
93+
sudo: false
9094
compiler: gcc
9195
cache: ccache
9296
addons:
@@ -121,7 +125,7 @@ jobs:
121125
# Ubuntu Linux with glibc using g++-5, debug mode
122126
- stage: Test different OS/CXX/Flags
123127
os: linux
124-
sudo: true
128+
sudo: false
125129
compiler: gcc
126130
cache: ccache
127131
addons:
@@ -207,7 +211,6 @@ jobs:
207211
# cmake build using g++-5
208212
- stage: Test different OS/CXX/Flags
209213
os: linux
210-
sudo: true
211214
compiler: gcc
212215
cache: ccache
213216
env:
@@ -233,7 +236,6 @@ jobs:
233236
# cmake build using g++-7
234237
- stage: Test different OS/CXX/Flags
235238
os: linux
236-
sudo: true
237239
compiler: gcc
238240
cache: ccache
239241
env:
@@ -259,7 +261,6 @@ jobs:
259261
# cmake build using clang++-6
260262
- stage: Test different OS/CXX/Flags
261263
os: linux
262-
sudo: true
263264
compiler: clang
264265
cache: ccache
265266
env:
@@ -314,7 +315,7 @@ jobs:
314315
- stage: Test different OS/CXX/Flags
315316
if: type = cron
316317
os: linux
317-
sudo: true
318+
sudo: false
318319
compiler: gcc
319320
cache: ccache
320321
addons:

0 commit comments

Comments
 (0)