mirror of
				https://github.com/KartKrewDev/RingRacers.git
				synced 2025-10-30 08:01:28 +00:00 
			
		
		
		
	Merge remote-tracking branch 'upstream/master'
This commit is contained in:
		
						commit
						afaa620f6b
					
				
					 2 changed files with 10 additions and 2 deletions
				
			
		|  | @ -26,6 +26,7 @@ matrix: | |||
|               - p7zip-full | ||||
|               - gcc-4.4 | ||||
|           compiler: gcc-4.4 | ||||
|           env: GCC44=1 | ||||
|           if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/ | ||||
|           #gcc-4.4 (Ubuntu/Linaro 4.4.7-8ubuntu1) 4.4.7 | ||||
|         - os: linux | ||||
|  | @ -39,6 +40,7 @@ matrix: | |||
|               - p7zip-full | ||||
|               - gcc-4.6 | ||||
|           compiler: gcc-4.6 | ||||
|           env: GCC46=1 | ||||
|           if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/ | ||||
|           #gcc-4.6 (Ubuntu/Linaro 4.6.4-6ubuntu2) 4.6.4 | ||||
|         - os: linux | ||||
|  | @ -56,6 +58,7 @@ matrix: | |||
|           #gcc-4.7 | ||||
|         - os: linux | ||||
|           compiler: gcc | ||||
|           env: GCC48=1 | ||||
|           if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/ | ||||
|           #gcc (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4 | ||||
|         - os: linux | ||||
|  | @ -71,6 +74,7 @@ matrix: | |||
|               - p7zip-full | ||||
|               - gcc-4.8 | ||||
|           compiler: gcc-4.8 | ||||
|           env: GCC48=1 | ||||
|           if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/ | ||||
|           #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5 | ||||
|         - os: linux | ||||
|  | @ -86,7 +90,7 @@ matrix: | |||
|               - p7zip-full | ||||
|               - gcc-7 | ||||
|           compiler: gcc-7 | ||||
|           env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough" | ||||
|           env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough" GCC72=1 | ||||
|           if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/ | ||||
|           #gcc-7 (Ubuntu 7.2.0-1ubuntu1~14.04) 7.2.0 20170802 | ||||
|         - os: linux | ||||
|  | @ -102,7 +106,7 @@ matrix: | |||
|               - p7zip-full | ||||
|               - gcc-8 | ||||
|           compiler: gcc-8 | ||||
|           env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough -Wno-error=format-overflow" | ||||
|           env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough -Wno-error=format-overflow" GCC81=1 | ||||
|           if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/ | ||||
|           #gcc-8 (Ubuntu 7.2.0-1ubuntu1~14.04) 8.1.0 | ||||
|         - os: linux | ||||
|  |  | |||
|  | @ -7,6 +7,10 @@ | |||
| # and other things | ||||
| # | ||||
| 
 | ||||
| ifdef GCC81 | ||||
| GCC80=1 | ||||
| endif | ||||
| 
 | ||||
| ifdef GCC80 | ||||
| GCC72=1 | ||||
| endif | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Alam Arias
						Alam Arias