mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Travis: build mobile on Linux with newer gcc
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									ca84d96a50
								
							
						
					
					
						commit
						fca06fd865
					
				
					 2 changed files with 8 additions and 1 deletions
				
			
		|  | @ -58,12 +58,14 @@ matrix: | ||||||
|     - env: SUBSURFACE_PLATFORM='linux2' |     - env: SUBSURFACE_PLATFORM='linux2' | ||||||
|       os: linux |       os: linux | ||||||
|       dist: trusty |       dist: trusty | ||||||
|  |       sudo: required | ||||||
|       language: c++ |       language: c++ | ||||||
|       addons: |       addons: | ||||||
|         apt: |         apt: | ||||||
|           sources: |           sources: | ||||||
|             - sourceline: 'ppa:beineri/opt-qt-5.10.1-trusty' |             - sourceline: 'ppa:beineri/opt-qt-5.10.1-trusty' | ||||||
|               key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x10C56D0DE9977759' |               key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x10C56D0DE9977759' | ||||||
|  |             - ubuntu-toolchain-r-test | ||||||
|           packages: |           packages: | ||||||
|             - qt510base |             - qt510base | ||||||
|             - qt510connectivity |             - qt510connectivity | ||||||
|  | @ -76,7 +78,8 @@ matrix: | ||||||
|             - qt510svg |             - qt510svg | ||||||
|             - qt510tools |             - qt510tools | ||||||
|             - git |             - git | ||||||
|             - g++ |             - gcc-5 | ||||||
|  |             - g++-5 | ||||||
|             - make |             - make | ||||||
|             - autoconf |             - autoconf | ||||||
|             - automake |             - automake | ||||||
|  |  | ||||||
|  | @ -8,6 +8,10 @@ | ||||||
| 
 | 
 | ||||||
| set -x | set -x | ||||||
| 
 | 
 | ||||||
|  | # make sure we use a new enough compiler | ||||||
|  | export CC=gcc-5 | ||||||
|  | export CXX=g++-5 | ||||||
|  | 
 | ||||||
| # Travis only pulls shallow repos. But that messes with git describe. | # Travis only pulls shallow repos. But that messes with git describe. | ||||||
| # Sorry Travis, fetching the whole thing and the tags as well... | # Sorry Travis, fetching the whole thing and the tags as well... | ||||||
| git fetch --unshallow | git fetch --unshallow | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue