🔧 Switch back to windows-2016
This commit is contained in:
		
							
								
								
									
										10
									
								
								.github/workflows/conan-pkg.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.github/workflows/conan-pkg.yml
									
									
									
									
										vendored
									
									
								
							| @@ -15,9 +15,11 @@ jobs: | |||||||
|           - name: Ubuntu |           - name: Ubuntu | ||||||
|             os: ubuntu-latest |             os: ubuntu-latest | ||||||
|           - name: Windows |           - name: Windows | ||||||
|             os: windows-latest |             os: windows-2016 | ||||||
|  |  | ||||||
|     name: ${{ matrix.config.name }} |     name: ${{ matrix.config.name }} | ||||||
|  |     env: | ||||||
|  |       DXSDK_DIR: C:\apps\Microsoft DirectX SDK\ | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  |  | ||||||
| @@ -34,7 +36,11 @@ jobs: | |||||||
|  |  | ||||||
|       - name: Install DX9 SDK |       - name: Install DX9 SDK | ||||||
|         if: startsWith(matrix.config.os, 'windows') |         if: startsWith(matrix.config.os, 'windows') | ||||||
|         run: choco install directx-sdk -y |         shell: cmake -P {0} | ||||||
|  |         run: | | ||||||
|  |           file(MAKE_DIRECTORY $ENV{DXSDK_DIR}) | ||||||
|  |           file(DOWNLOAD http://prdownloads.sourceforge.net/rigs-of-rods/DirectX-SDK.zip "$ENV{TMP}/DirectX.zip" SHOW_PROGRESS) | ||||||
|  |           execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/DirectX.zip" WORKING_DIRECTORY "$ENV{DXSDK_DIR}") | ||||||
|  |  | ||||||
|       - name: Run |       - name: Run | ||||||
|         env: |         env: | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user