mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-10-29 03:26:38 +00:00 
			
		
		
		
	Merge pull request #2295 from OpenMW/no-analyze-on-macos-ci
Fix macOS CI build timeouts
This commit is contained in:
		
						commit
						9fae10b318
					
				
					 3 changed files with 7 additions and 6 deletions
				
			
		|  | @ -41,9 +41,9 @@ addons: | ||||||
|     build_command: "make VERBOSE=1 -j3" |     build_command: "make VERBOSE=1 -j3" | ||||||
| matrix: | matrix: | ||||||
|   include: |   include: | ||||||
|     - name: OpenMW (all) on macOS Xcode 10.1 |     - name: OpenMW (all) on macOS Xcode 10.2 | ||||||
|       os: osx |       os: osx | ||||||
|       osx_image: xcode10.1 |       osx_image: xcode10.2 | ||||||
|       if: branch != coverity_scan |       if: branch != coverity_scan | ||||||
|     - name: OpenMW (all) on Ubuntu Xenial GCC-5 |     - name: OpenMW (all) on Ubuntu Xenial GCC-5 | ||||||
|       os: linux |       os: linux | ||||||
|  |  | ||||||
|  | @ -1,11 +1,9 @@ | ||||||
| #!/bin/sh -e | #!/bin/sh -e | ||||||
| 
 | 
 | ||||||
| brew update | brew update | ||||||
| brew unlink cmake || true |  | ||||||
| brew install https://gist.githubusercontent.com/nikolaykasyanov/f36da224bdef42025e480f99fa21a82d/raw/7dd8b5ed2750198757f81c6bc6456e03541999bd/cmake.rb |  | ||||||
| brew switch cmake 3.12.4 |  | ||||||
| brew outdated pkgconfig || brew upgrade pkgconfig | brew outdated pkgconfig || brew upgrade pkgconfig | ||||||
| brew install qt | brew install qt | ||||||
|  | brew install ccache | ||||||
| 
 | 
 | ||||||
| curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-110f3d3.zip -o ~/openmw-deps.zip | curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-110f3d3.zip -o ~/openmw-deps.zip | ||||||
| unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null | unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null | ||||||
|  |  | ||||||
|  | @ -4,12 +4,15 @@ export CXX=clang++ | ||||||
| export CC=clang | export CC=clang | ||||||
| 
 | 
 | ||||||
| DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps" | DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps" | ||||||
| QT_PATH=`brew --prefix qt` | QT_PATH=$(brew --prefix qt) | ||||||
|  | CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache | ||||||
| mkdir build | mkdir build | ||||||
| cd build | cd build | ||||||
| 
 | 
 | ||||||
| cmake \ | cmake \ | ||||||
| -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \ | -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \ | ||||||
|  | -D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \ | ||||||
|  | -D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \ | ||||||
| -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \ | -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \ | ||||||
| -D CMAKE_OSX_SYSROOT="macosx10.14" \ | -D CMAKE_OSX_SYSROOT="macosx10.14" \ | ||||||
| -D CMAKE_BUILD_TYPE=Release \ | -D CMAKE_BUILD_TYPE=Release \ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue