Skip to content

Commit

Permalink
Merge branch 'hedge-dev:main' into Nintendo-Layout-tempt-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
AL2009man authored Mar 5, 2025
2 parents b306f55 + 0866be0 commit e077fa2
Showing 1 changed file with 20 additions and 7 deletions.
27 changes: 20 additions & 7 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ jobs:
build-linux:
name: Build Linux
runs-on: ubuntu-24.04
strategy:
matrix:
preset: ["linux-debug", "linux-release", "linux-relwithdebinfo"]
env:
LLVM_VERSION: 18
CMAKE_PRESET: linux-release
CMAKE_PRESET: ${{ matrix.preset }}

steps:
- name: Checkout Repository
Expand All @@ -34,7 +37,7 @@ jobs:
- name: Setup ccache
uses: hendrikmuhs/[email protected]
with:
key: ccache-${{ runner.os }}
key: ccache-${{ runner.os }}-${{ matrix.preset }}

- name: Cache vcpkg
uses: actions/cache@v4
Expand All @@ -55,7 +58,7 @@ jobs:
uses: actions/cache@v4
with:
path: /tmp/ccache
key: ccache-${{ runner.os }}
key: ccache-${{ runner.os }}-${{ matrix.preset }}

- name: Prepare Project
run: cp ./private/* ./UnleashedRecompLib/private
Expand All @@ -73,13 +76,16 @@ jobs:
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: UnleashedRecomp-Linux
name: UnleashedRecomp-Linux-${{ env.CMAKE_PRESET }}
path: ./out/build/${{ env.CMAKE_PRESET }}/UnleashedRecomp/UnleashedRecomp
build-windows:
name: Build Windows
runs-on: windows-latest
strategy:
matrix:
preset: ["x64-Clang-Debug", "x64-Clang-Release", "x64-Clang-RelWithDebInfo"]
env:
CMAKE_PRESET: x64-Clang-Release
CMAKE_PRESET: ${{ matrix.preset }}

steps:
- name: Checkout repository
Expand All @@ -97,7 +103,7 @@ jobs:
- name: Setup ccache
uses: hendrikmuhs/[email protected]
with:
key: ccache-${{ runner.os }}
key: ccache-${{ runner.os }}-${{ matrix.preset }}

- name: Cache vcpkg
uses: actions/cache@v4
Expand Down Expand Up @@ -144,8 +150,15 @@ jobs:
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: UnleashedRecomp-Windows
name: UnleashedRecomp-Windows-${{ env.CMAKE_PRESET }}
path: .\UnleashedRecomp-Windows.zip

- name: Upload PDB
uses: actions/upload-artifact@v4
if: ${{ matrix.preset != 'x64-Clang-Release' }}
with:
name: UnleashedRecomp-Windows-${{ env.CMAKE_PRESET }}-PDB
path: .\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\UnleashedRecomp.pdb
build-flatpak:
name: Build Flatpak
runs-on: ubuntu-24.04
Expand Down

0 comments on commit e077fa2

Please sign in to comment.