blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 07:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated ubuntu to newest version for clang-17

Browse source
This commit is contained in:
AdenKoperczak 2024-09-19 12:16:34 -04:00
parent dfab86a4ad
commit 5f27d1e484
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.github/workflows/ci.yml vendored
View file

@ -40,7 +40,7 @@ jobs:
conan_package_manager: '' conan_package_manager: ''
artifact_suffix: windows-x64 artifact_suffix: windows-x64
- name: linux64_gcc - name: linux64_gcc
os: ubuntu-22.04 os: ubuntu-24.04
build_type: Release build_type: Release
env_cc: gcc-11 env_cc: gcc-11
env_cxx: g++-11 env_cxx: g++-11
@ -57,7 +57,7 @@ jobs:
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
- name: linux64_clang - name: linux64_clang
os: ubuntu-22.04 os: ubuntu-24.04
build_type: Release build_type: Release
env_cc: clang-17 env_cc: clang-17
env_cxx: clang++-17 env_cxx: clang++-17
@ -106,7 +106,7 @@ jobs:
vsversion: ${{ matrix.msvc_version }} vsversion: ${{ matrix.msvc_version }}
- name: Setup Ubuntu Environment - name: Setup Ubuntu Environment
if: matrix.os == 'ubuntu-22.04' if: matrix.os == 'ubuntu-24.04'
shell: bash shell: bash
run: | run: |
sudo apt-get install doxygen \ sudo apt-get install doxygen \
@ -147,7 +147,7 @@ jobs:
ninja supercell-wx wxtest ninja supercell-wx wxtest
- name: Separate Debug Symbols (Linux) - name: Separate Debug Symbols (Linux)
if: matrix.os == 'ubuntu-22.04' if: matrix.os == 'ubuntu-24.04'
shell: bash shell: bash
run: | run: |
cd build/ cd build/
@ -166,7 +166,7 @@ jobs:
cmake --install . --component supercell-wx cmake --install . --component supercell-wx
- name: Collect Artifacts - name: Collect Artifacts
if: matrix.os == 'ubuntu-22.04' if: matrix.os == 'ubuntu-24.04'
shell: bash shell: bash
run: | run: |
pushd supercell-wx/ pushd supercell-wx/
@ -198,14 +198,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-22.04' if: matrix.os == 'ubuntu-24.04'
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-22.04' if: matrix.os == 'ubuntu-24.04'
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 }}
@ -228,7 +228,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-22.04' if: matrix.os == 'ubuntu-24.04'
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
@ -252,7 +252,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-22.04' if: matrix.os == 'ubuntu-24.04'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: supercell-wx-appimage-x64 name: supercell-wx-appimage-x64