improvements to CI files
							parent
							
								
									f23f29d1ef
								
							
						
					
					
						commit
						f9b8de3876
					
				|  | @ -47,8 +47,7 @@ jobs: | |||
|       - name: Checkout | ||||
|         uses: actions/checkout@v2 | ||||
| 
 | ||||
|       - name: Install (Linux) | ||||
|         if: runner.os == 'Linux' | ||||
|       - name: Install Dependencies | ||||
|         run: | | ||||
|           # LLVM (clang) 9 is not in Bionic's repositories so we add the official LLVM repository. | ||||
|           if [ "${{ matrix.compiler }}" = "clang" ] && [ "${{ matrix.version }}" = "9" ]; then | ||||
|  | @ -63,7 +62,7 @@ jobs: | |||
|           fi | ||||
|           sudo apt-get -y update | ||||
| 
 | ||||
|           sudo apt-get install cmake build-essential pkg-config libpython-dev python-numpy libicu-dev | ||||
|           sudo apt-get -y install cmake build-essential pkg-config libpython-dev python-numpy libicu-dev | ||||
| 
 | ||||
|           if [ "${{ matrix.compiler }}" = "gcc" ]; then | ||||
|             sudo apt-get install -y g++-${{ matrix.version }} g++-${{ matrix.version }}-multilib | ||||
|  | @ -79,7 +78,5 @@ jobs: | |||
|         run: | | ||||
|           bash .github/scripts/boost.sh | ||||
| 
 | ||||
|       - name: Build and Test (Linux) | ||||
|         if: runner.os == 'Linux' | ||||
|         run: | | ||||
|           bash .github/scripts/unix.sh -t | ||||
|       - name: Build and Test | ||||
|         run: bash .github/scripts/unix.sh -t | ||||
|  |  | |||
|  | @ -34,8 +34,7 @@ jobs: | |||
|       - name: Checkout | ||||
|         uses: actions/checkout@v2 | ||||
| 
 | ||||
|       - name: Install (macOS) | ||||
|         if: runner.os == 'macOS' | ||||
|       - name: Install Dependencies | ||||
|         run: | | ||||
|           brew install cmake ninja | ||||
|           brew install boost | ||||
|  | @ -48,7 +47,5 @@ jobs: | |||
|             echo "CC=clang" >> $GITHUB_ENV | ||||
|             echo "CXX=clang++" >> $GITHUB_ENV | ||||
|           fi | ||||
|       - name: Build and Test (macOS) | ||||
|         if: runner.os == 'macOS' | ||||
|         run: | | ||||
|           bash .github/scripts/unix.sh -t | ||||
|       - name: Build and Test | ||||
|         run: bash .github/scripts/unix.sh -t | ||||
|  |  | |||
|  | @ -81,7 +81,7 @@ jobs: | |||
|           fi | ||||
|           sudo apt-get -y update | ||||
|            | ||||
|           sudo apt install cmake build-essential pkg-config libpython-dev python-numpy libboost-all-dev | ||||
|           sudo apt-get -y install cmake build-essential pkg-config libpython-dev python-numpy libboost-all-dev | ||||
|            | ||||
|           if [ "${{ matrix.compiler }}" = "gcc" ]; then | ||||
|             sudo apt-get install -y g++-${{ matrix.version }} g++-${{ matrix.version }}-multilib | ||||
|  |  | |||
|  | @ -70,7 +70,7 @@ jobs: | |||
|           fi | ||||
|           sudo apt-get -y update | ||||
| 
 | ||||
|           sudo apt install cmake build-essential pkg-config libpython-dev python-numpy libicu-dev | ||||
|           sudo apt-get -y install cmake build-essential pkg-config libpython-dev python-numpy libicu-dev | ||||
| 
 | ||||
|           if [ "${{ matrix.compiler }}" = "gcc" ]; then | ||||
|             sudo apt-get install -y g++-${{ matrix.version }} g++-${{ matrix.version }}-multilib | ||||
|  |  | |||
|  | @ -18,15 +18,14 @@ jobs: | |||
|         # Github Actions requires a single row to be added to the build matrix. | ||||
|         # See https://help.github.com/en/articles/workflow-syntax-for-github-actions. | ||||
|         name: [ | ||||
|           #TODO This build keeps timing out, need to understand why. | ||||
|           # windows-2016-cl, | ||||
|           windows-2019-cl, | ||||
|         ] | ||||
|             #TODO This build keeps timing out, need to understand why. | ||||
|             # windows-2016-cl, | ||||
|             windows-2019-cl, | ||||
|           ] | ||||
| 
 | ||||
|         build_type: [Debug, Release] | ||||
|         build_unstable: [ON] | ||||
|         include: | ||||
| 
 | ||||
|           #TODO This build keeps timing out, need to understand why. | ||||
|           # - name: windows-2016-cl | ||||
|           #   os: windows-2016 | ||||
|  | @ -37,10 +36,7 @@ jobs: | |||
|             compiler: cl | ||||
| 
 | ||||
|     steps: | ||||
|       - name: Checkout | ||||
|         uses: actions/checkout@v2 | ||||
|       - name: Install (Windows) | ||||
|         if: runner.os == 'Windows' | ||||
|       - name: Install | ||||
|         shell: powershell | ||||
|         run: | | ||||
|           Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh') | ||||
|  | @ -72,8 +68,10 @@ jobs: | |||
|           boost_version: 1.72.0 | ||||
|           toolset: msvc14.2 | ||||
| 
 | ||||
|       - name: Build (Windows) | ||||
|         if: runner.os == 'Windows' | ||||
|       - name: Checkout | ||||
|         uses: actions/checkout@v2 | ||||
| 
 | ||||
|       - name: Build | ||||
|         env: | ||||
|           BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} | ||||
|         run: | | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue