mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 06:40:05 +00:00 
			
		
		
		
	Merge pull request #287 from AdenKoperczak/fix_running_on_older_glibc
Revert to using ubuntu-22.04 for GCC build to ensure support for older GLibc versions
This commit is contained in:
		
						commit
						194638f759
					
				
					 1 changed files with 12 additions and 12 deletions
				
			
		
							
								
								
									
										22
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -41,7 +41,7 @@ jobs: | ||||||
|             conan_package_manager: '' |             conan_package_manager: '' | ||||||
|             artifact_suffix: windows-x64 |             artifact_suffix: windows-x64 | ||||||
|           - name: linux64_gcc |           - name: linux64_gcc | ||||||
|             os: ubuntu-24.04 |             os: ubuntu-22.04 | ||||||
|             build_type: Release |             build_type: Release | ||||||
|             env_cc: gcc-11 |             env_cc: gcc-11 | ||||||
|             env_cxx: g++-11 |             env_cxx: g++-11 | ||||||
|  | @ -58,6 +58,7 @@ jobs: | ||||||
|             conan_compiler_runtime: '' |             conan_compiler_runtime: '' | ||||||
|             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True |             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True | ||||||
|             artifact_suffix: linux-x64 |             artifact_suffix: linux-x64 | ||||||
|  |             compiler_packages: '' | ||||||
|           - name: linux64_clang |           - name: linux64_clang | ||||||
|             os: ubuntu-24.04 |             os: ubuntu-24.04 | ||||||
|             build_type: Release |             build_type: Release | ||||||
|  | @ -76,6 +77,7 @@ jobs: | ||||||
|             conan_compiler_runtime: '' |             conan_compiler_runtime: '' | ||||||
|             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True |             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True | ||||||
|             artifact_suffix: linux-clang-x64 |             artifact_suffix: linux-clang-x64 | ||||||
|  |             compiler_packages: clang-17 | ||||||
|     name: ${{ matrix.name }} |     name: ${{ matrix.name }} | ||||||
|     env: |     env: | ||||||
|       CC: ${{ matrix.env_cc }} |       CC: ${{ matrix.env_cc }} | ||||||
|  | @ -109,15 +111,13 @@ jobs: | ||||||
|         vsversion: ${{ matrix.msvc_version }} |         vsversion: ${{ matrix.msvc_version }} | ||||||
| 
 | 
 | ||||||
|     - name: Setup Ubuntu Environment |     - name: Setup Ubuntu Environment | ||||||
|       if: matrix.os == 'ubuntu-24.04' |       if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||||||
|       shell: bash |       shell: bash | ||||||
|       run: | |       run: | | ||||||
|         sudo apt-get install doxygen \ |         sudo apt-get install doxygen \ | ||||||
|                              libfuse2 \ |                              libfuse2 \ | ||||||
|                              ninja-build \ |                              ninja-build \ | ||||||
|                              clang-17 \ |                              ${{ matrix.compiler_packages }} | ||||||
|                              gcc-11 \ |  | ||||||
|                              g++-11 |  | ||||||
| 
 | 
 | ||||||
|     - name: Setup Python Environment |     - name: Setup Python Environment | ||||||
|       shell: pwsh |       shell: pwsh | ||||||
|  | @ -153,7 +153,7 @@ jobs: | ||||||
|         ninja supercell-wx wxtest |         ninja supercell-wx wxtest | ||||||
| 
 | 
 | ||||||
|     - name: Separate Debug Symbols (Linux) |     - name: Separate Debug Symbols (Linux) | ||||||
|       if: matrix.os == 'ubuntu-24.04' |       if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||||||
|       shell: bash |       shell: bash | ||||||
|       run: | |       run: | | ||||||
|         cd build/ |         cd build/ | ||||||
|  | @ -172,7 +172,7 @@ jobs: | ||||||
|         cmake --install . --component supercell-wx |         cmake --install . --component supercell-wx | ||||||
| 
 | 
 | ||||||
|     - name: Collect Artifacts |     - name: Collect Artifacts | ||||||
|       if: matrix.os == 'ubuntu-24.04' |       if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||||||
|       shell: bash |       shell: bash | ||||||
|       run: | |       run: | | ||||||
|         pushd supercell-wx/ |         pushd supercell-wx/ | ||||||
|  | @ -204,14 +204,14 @@ jobs: | ||||||
|         path: ${{ github.workspace }}/build/bin/*.pdb |         path: ${{ github.workspace }}/build/bin/*.pdb | ||||||
| 
 | 
 | ||||||
|     - name: Upload Artifacts (Linux) |     - name: Upload Artifacts (Linux) | ||||||
|       if: matrix.os == 'ubuntu-24.04' |       if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||||||
|       uses: actions/upload-artifact@v4 |       uses: actions/upload-artifact@v4 | ||||||
|       with: |       with: | ||||||
|         name: supercell-wx-${{ matrix.artifact_suffix }} |         name: supercell-wx-${{ matrix.artifact_suffix }} | ||||||
|         path: ${{ github.workspace }}/supercell-wx-${{ matrix.artifact_suffix }}.tar.gz |         path: ${{ github.workspace }}/supercell-wx-${{ matrix.artifact_suffix }}.tar.gz | ||||||
| 
 | 
 | ||||||
|     - name: Upload Debug Artifacts (Linux) |     - name: Upload Debug Artifacts (Linux) | ||||||
|       if: matrix.os == 'ubuntu-24.04' |       if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||||||
|       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 }} | ||||||
|  | @ -234,7 +234,7 @@ jobs: | ||||||
|         path: ${{ github.workspace }}/build/supercell-wx-*.msi* |         path: ${{ github.workspace }}/build/supercell-wx-*.msi* | ||||||
| 
 | 
 | ||||||
|     - name: Build AppImage (Linux) |     - name: Build AppImage (Linux) | ||||||
|       if: matrix.os == 'ubuntu-24.04' |       if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||||||
|       env: |       env: | ||||||
|         APPIMAGE_DIR: ${{ github.workspace }}/supercell-wx/ |         APPIMAGE_DIR: ${{ github.workspace }}/supercell-wx/ | ||||||
|         LDAI_UPDATE_INFORMATION: gh-releases-zsync|dpaulat|supercell-wx|latest|*x86_64.AppImage.zsync |         LDAI_UPDATE_INFORMATION: gh-releases-zsync|dpaulat|supercell-wx|latest|*x86_64.AppImage.zsync | ||||||
|  | @ -258,7 +258,7 @@ jobs: | ||||||
|         rm -f linuxdeploy-x86_64.AppImage |         rm -f linuxdeploy-x86_64.AppImage | ||||||
| 
 | 
 | ||||||
|     - name: Upload AppImage (Linux) |     - name: Upload AppImage (Linux) | ||||||
|       if: matrix.os == 'ubuntu-24.04' |       if: ${{ startsWith(matrix.os, 'ubuntu') }} | ||||||
|       uses: actions/upload-artifact@v4 |       uses: actions/upload-artifact@v4 | ||||||
|       with: |       with: | ||||||
|         name: supercell-wx-appimage-${{ matrix.artifact_suffix }} |         name: supercell-wx-appimage-${{ matrix.artifact_suffix }} | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat