mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 01:20:06 +00:00 
			
		
		
		
	Install build artifacts and upload
This commit is contained in:
		
							parent
							
								
									ca2ecc3e60
								
							
						
					
					
						commit
						90a913750a
					
				
					 4 changed files with 37 additions and 7 deletions
				
			
		
							
								
								
									
										16
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -36,6 +36,7 @@ jobs: | ||||||
|             conan_compiler: Visual Studio |             conan_compiler: Visual Studio | ||||||
|             conan_compiler_version: 17 |             conan_compiler_version: 17 | ||||||
|             conan_compiler_runtime: MD |             conan_compiler_runtime: MD | ||||||
|  |             artifact_suffix: windows-x64 | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
| 
 | 
 | ||||||
|     steps: |     steps: | ||||||
|  | @ -45,7 +46,7 @@ jobs: | ||||||
|     - name: Checkout |     - name: Checkout | ||||||
|       uses: actions/checkout@v3 |       uses: actions/checkout@v3 | ||||||
|       with: |       with: | ||||||
|         path: scwx |         path: source | ||||||
|         submodules: recursive |         submodules: recursive | ||||||
| 
 | 
 | ||||||
|     - name: Install Qt |     - name: Install Qt | ||||||
|  | @ -73,7 +74,7 @@ jobs: | ||||||
|       run: | |       run: | | ||||||
|         pip install conan |         pip install conan | ||||||
|         conan profile new default --detect |         conan profile new default --detect | ||||||
|         conan install ./scwx/ ` |         conan install ./source/ ` | ||||||
|           --remote conancenter ` |           --remote conancenter ` | ||||||
|           --build missing ` |           --build missing ` | ||||||
|           --settings arch=${{ matrix.conan_arch }} ` |           --settings arch=${{ matrix.conan_arch }} ` | ||||||
|  | @ -87,11 +88,18 @@ jobs: | ||||||
|       run: | |       run: | | ||||||
|         mkdir build |         mkdir build | ||||||
|         cd build |         cd build | ||||||
|         cmake ../scwx/ ` |         cmake ../source/ ` | ||||||
|           -G Ninja ` |           -G Ninja ` | ||||||
|           -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" ` |           -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" ` | ||||||
|           -DCMAKE_INSTALL_PREFIX="../install" |           -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/supercell-wx" | ||||||
|         ninja supercell-wx wxtest |         ninja supercell-wx wxtest | ||||||
|  |         cmake --install . --component supercell-wx | ||||||
|  | 
 | ||||||
|  |     - name: Upload Artifacts | ||||||
|  |       uses: actions/upload-artifact@v3 | ||||||
|  |       with: | ||||||
|  |         name: supercell-wx-${{ matrix.artifact_suffix }} | ||||||
|  |         path: ${{ github.workspace }}/supercell-wx/ | ||||||
| 
 | 
 | ||||||
|     - name: Test Supercell Wx |     - name: Test Supercell Wx | ||||||
|       working-directory: ${{ github.workspace }}/build |       working-directory: ${{ github.workspace }}/build | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| cmake_minimum_required(VERSION 3.20) | cmake_minimum_required(VERSION 3.21) | ||||||
| set(PROJECT_NAME supercell-wx) | set(PROJECT_NAME supercell-wx) | ||||||
| project(${PROJECT_NAME} C CXX) | project(${PROJECT_NAME} C CXX) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| cmake_minimum_required(VERSION 3.20) | cmake_minimum_required(VERSION 3.21) | ||||||
| 
 | 
 | ||||||
| set_property(DIRECTORY | set_property(DIRECTORY | ||||||
|              APPEND |              APPEND | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| cmake_minimum_required(VERSION 3.20) | cmake_minimum_required(VERSION 3.21) | ||||||
| 
 | 
 | ||||||
| project(scwx-qt LANGUAGES CXX) | project(scwx-qt LANGUAGES CXX) | ||||||
| 
 | 
 | ||||||
|  | @ -362,3 +362,25 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets | ||||||
| 
 | 
 | ||||||
| target_link_libraries(supercell-wx PRIVATE scwx-qt | target_link_libraries(supercell-wx PRIVATE scwx-qt | ||||||
|                                            wxdata) |                                            wxdata) | ||||||
|  | 
 | ||||||
|  | install(TARGETS supercell-wx | ||||||
|  |                 qmaplibregl | ||||||
|  |         RUNTIME_DEPENDENCIES | ||||||
|  |           PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" "qt6" | ||||||
|  |           POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" | ||||||
|  |         RUNTIME | ||||||
|  |         COMPONENT supercell-wx) | ||||||
|  | 
 | ||||||
|  | qt_generate_deploy_app_script(TARGET supercell-wx | ||||||
|  |                               FILENAME_VARIABLE deploy_script_scwx | ||||||
|  |                               NO_UNSUPPORTED_PLATFORM_ERROR) | ||||||
|  | 
 | ||||||
|  | qt_generate_deploy_app_script(TARGET qmaplibregl | ||||||
|  |                               FILENAME_VARIABLE deploy_script_qmaplibregl | ||||||
|  |                               NO_UNSUPPORTED_PLATFORM_ERROR) | ||||||
|  | 
 | ||||||
|  | install(SCRIPT ${deploy_script_scwx} | ||||||
|  |         COMPONENT supercell-wx) | ||||||
|  | 
 | ||||||
|  | install(SCRIPT ${deploy_script_qmaplibregl} | ||||||
|  |         COMPONENT supercell-wx) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat