Skip to content

Travis: revert sudo-workarounds #2899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2018
Merged

Travis: revert sudo-workarounds #2899

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7e95f4
Revert "Travis: Mark all Linux builds as sudo-required as maven worka…
tautschnig Aug 31, 2018
1093b14
Revert "Try to fix travis failure on doxygen stage"
tautschnig Aug 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -86,7 +90,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:
Expand Down Expand Up @@ -121,7 +125,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:
Expand Down Expand Up @@ -207,7 +211,6 @@ jobs:
# cmake build using g++-5
- stage: Test different OS/CXX/Flags
os: linux
sudo: true
compiler: gcc
cache: ccache
env:
Expand All @@ -233,7 +236,6 @@ jobs:
# cmake build using g++-7
- stage: Test different OS/CXX/Flags
os: linux
sudo: true
compiler: gcc
cache: ccache
env:
Expand All @@ -259,7 +261,6 @@ jobs:
# cmake build using clang++-6
- stage: Test different OS/CXX/Flags
os: linux
sudo: true
compiler: clang
cache: ccache
env:
Expand Down Expand Up @@ -314,7 +315,7 @@ jobs:
- stage: Test different OS/CXX/Flags
if: type = cron
os: linux
sudo: true
sudo: false
compiler: gcc
cache: ccache
addons:
Expand Down