Skip to content

Commit

Permalink
Merge branch 'shadps4-emu:main' into Full-BB
Browse files Browse the repository at this point in the history
  • Loading branch information
diegolix29 authored Jan 7, 2025
2 parents d34fb9a + 869bf85 commit 81c8358
Show file tree
Hide file tree
Showing 31 changed files with 6,455 additions and 15,321 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ env:

jobs:
reuse:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
continue-on-error: true
steps:
- uses: actions/checkout@v4
- uses: fsfe/reuse-action@v5

clang-format:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
continue-on-error: true
steps:
- uses: actions/checkout@v4
Expand All @@ -39,7 +39,7 @@ jobs:
run: ./.ci/clang-format.sh

get-info:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
date: ${{ steps.vars.outputs.date }}
shorthash: ${{ steps.vars.outputs.shorthash }}
Expand All @@ -57,7 +57,7 @@ jobs:
echo "fullhash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
windows-sdl:
runs-on: windows-latest
runs-on: windows-2025
needs: get-info
steps:
- name: Upgrade LLVM to 19
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
path: ${{github.workspace}}/build/shadPS4.exe

windows-qt:
runs-on: windows-latest
runs-on: windows-2025
needs: get-info
steps:
- name: Upgrade LLVM to 19
Expand Down
Loading

0 comments on commit 81c8358

Please sign in to comment.