mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-30 23:50:05 +00:00 
			
		
		
		
	Additional Conan 2.x, multi-config and CI updates
This commit is contained in:
		
							parent
							
								
									07cac3a03f
								
							
						
					
					
						commit
						6f70499105
					
				
					 2 changed files with 6 additions and 4 deletions
				
			
		
							
								
								
									
										9
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -132,7 +132,7 @@ jobs: | ||||||
|       shell: pwsh |       shell: pwsh | ||||||
|       run: | |       run: | | ||||||
|         pip install conan |         pip install conan | ||||||
|         conan profile new default --detect |         conan profile detect | ||||||
|         conan install ./source/ ` |         conan install ./source/ ` | ||||||
|           --remote conancenter ` |           --remote conancenter ` | ||||||
|           --build missing ` |           --build missing ` | ||||||
|  | @ -161,6 +161,7 @@ jobs: | ||||||
|       shell: bash |       shell: bash | ||||||
|       run: | |       run: | | ||||||
|         cd build/ |         cd build/ | ||||||
|  |         cd Release/ | ||||||
|         cd bin/ |         cd bin/ | ||||||
|         objcopy --only-keep-debug supercell-wx supercell-wx.debug |         objcopy --only-keep-debug supercell-wx supercell-wx.debug | ||||||
|         objcopy --strip-debug --strip-unneeded supercell-wx |         objcopy --strip-debug --strip-unneeded supercell-wx | ||||||
|  | @ -205,7 +206,7 @@ jobs: | ||||||
|       uses: actions/upload-artifact@v4 |       uses: actions/upload-artifact@v4 | ||||||
|       with: |       with: | ||||||
|         name: supercell-wx-debug-${{ matrix.artifact_suffix }} |         name: supercell-wx-debug-${{ matrix.artifact_suffix }} | ||||||
|         path: ${{ github.workspace }}/build/bin/*.pdb |         path: ${{ github.workspace }}/build/Release/bin/*.pdb | ||||||
| 
 | 
 | ||||||
|     - name: Upload Artifacts (Linux) |     - name: Upload Artifacts (Linux) | ||||||
|       if: ${{ startsWith(matrix.os, 'ubuntu') }} |       if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||||||
|  | @ -220,8 +221,8 @@ jobs: | ||||||
|       with: |       with: | ||||||
|         name: supercell-wx-debug-${{ matrix.artifact_suffix }} |         name: supercell-wx-debug-${{ matrix.artifact_suffix }} | ||||||
|         path: | |         path: | | ||||||
|           ${{ github.workspace }}/build/bin/*.debug |           ${{ github.workspace }}/build/Release/bin/*.debug | ||||||
|           ${{ github.workspace }}/build/lib/*.debug |           ${{ github.workspace }}/build/Release/lib/*.debug | ||||||
| 
 | 
 | ||||||
|     - name: Build Installer (Windows) |     - name: Build Installer (Windows) | ||||||
|       if: matrix.os == 'windows-2022' |       if: matrix.os == 'windows-2022' | ||||||
|  |  | ||||||
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							|  | @ -5,6 +5,7 @@ CMakeLists.txt.user | ||||||
| CMakeCache.txt | CMakeCache.txt | ||||||
| CMakeFiles | CMakeFiles | ||||||
| CMakeScripts | CMakeScripts | ||||||
|  | CMakeUserPresets.json | ||||||
| Testing | Testing | ||||||
| cmake_install.cmake | cmake_install.cmake | ||||||
| install_manifest.txt | install_manifest.txt | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat