logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: fc99d11703cda77d5aad406567e0c23e2b971f7c
parent: 48652cb41e328e6ad32cb5cb54aefc978df6b11b
Author: Mingye Wang <arthur200126@gmail.com>
Date:   Tue, 25 Apr 2017 14:14:34 -0400

Convert to "container-based" travis build (#2449)

* Convert to "container-based" travis build

Since all ppa sources used are currently whitelisted by Travis, why don't we convert to a "sudo-less" structure that promises a shorter build start time?

* Explicitly disable sudo in Travis

Diffstat:

M.travis.yml14++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml @@ -1,7 +1,7 @@ language: ruby cache: bundler dist: trusty -sudo: required +sudo: false notifications: email: false @@ -14,6 +14,13 @@ env: - CXX=g++-4.8 addons: postgresql: 9.4 + apt: + sources: + - ubuntu-toolchain-r-test + - trusty-media + packages: + - g++-4.8 + - ffmpeg rvm: - 2.3.4 @@ -24,11 +31,6 @@ services: bundler_args: --without development production --retry=3 --jobs=3 -before_install: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo add-apt-repository -y ppa:mc3man/trusty-media - - sudo apt-get -qq update - - sudo apt-get -qq install g++-4.8 ffmpeg install: - nvm install - npm install -g yarn