forked from cybrespace/mastodon
		
	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
This commit is contained in:
		
							parent
							
								
									48652cb41e
								
							
						
					
					
						commit
						fc99d11703
					
				
					 1 changed files with 8 additions and 6 deletions
				
			
		
							
								
								
									
										14
									
								
								.travis.yml
									
										
									
									
									
								
							
							
						
						
									
										14
									
								
								.travis.yml
									
										
									
									
									
								
							| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
language: ruby
 | 
					language: ruby
 | 
				
			||||||
cache: bundler
 | 
					cache: bundler
 | 
				
			||||||
dist: trusty
 | 
					dist: trusty
 | 
				
			||||||
sudo: required
 | 
					sudo: false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
notifications:
 | 
					notifications:
 | 
				
			||||||
  email: false
 | 
					  email: false
 | 
				
			||||||
| 
						 | 
					@ -14,6 +14,13 @@ env:
 | 
				
			||||||
    - CXX=g++-4.8
 | 
					    - CXX=g++-4.8
 | 
				
			||||||
addons:
 | 
					addons:
 | 
				
			||||||
  postgresql: 9.4
 | 
					  postgresql: 9.4
 | 
				
			||||||
 | 
					  apt:
 | 
				
			||||||
 | 
					    sources:
 | 
				
			||||||
 | 
					    - ubuntu-toolchain-r-test
 | 
				
			||||||
 | 
					    - trusty-media
 | 
				
			||||||
 | 
					    packages:
 | 
				
			||||||
 | 
					    - g++-4.8
 | 
				
			||||||
 | 
					    - ffmpeg
 | 
				
			||||||
 | 
					
 | 
				
			||||||
rvm:
 | 
					rvm:
 | 
				
			||||||
  - 2.3.4
 | 
					  - 2.3.4
 | 
				
			||||||
| 
						 | 
					@ -24,11 +31,6 @@ services:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bundler_args: --without development production --retry=3 --jobs=3
 | 
					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:
 | 
					install:
 | 
				
			||||||
  - nvm install
 | 
					  - nvm install
 | 
				
			||||||
  - npm install -g yarn
 | 
					  - npm install -g yarn
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue