From 93797af73fed5a35d2e02b1bd99008027ab1d999 Mon Sep 17 00:00:00 2001 From: Xphalnos <164882787+Xphalnos@users.noreply.github.com> Date: Wed, 8 May 2024 13:17:41 +0200 Subject: [PATCH] Update Workflows (#127) * Update Workflows * Update clang-format.sh * Revert "Update clang-format.sh" This reverts commit 391bf7e639bcaf795a40a04b8a7ef4095b44fb33. * Clang 17 --- .github/workflows/ci.yml | 3 +-- .github/workflows/format.yml | 2 +- .github/workflows/linux-qt.yml | 4 ++-- .github/workflows/linux.yml | 2 +- .github/workflows/windows-qt.yml | 8 ++++---- .github/workflows/windows.yml | 6 +++--- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 645a2ea9..b66253d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,3 @@ - # SPDX-FileCopyrightText: 2021 yuzu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later @@ -15,4 +14,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: fsfe/reuse-action@v1 \ No newline at end of file + - uses: fsfe/reuse-action@v3 \ No newline at end of file diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 70b23832..b9887cca 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -25,4 +25,4 @@ jobs: - name: Build env: COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} - run: ./.ci/clang-format.sh + run: ./.ci/clang-format.sh \ No newline at end of file diff --git a/.github/workflows/linux-qt.yml b/.github/workflows/linux-qt.yml index d7f0e908..2d3d406a 100644 --- a/.github/workflows/linux-qt.yml +++ b/.github/workflows/linux-qt.yml @@ -38,7 +38,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.6.1 + version: 6.7.0 host: linux target: desktop #arch: clang++-17 @@ -59,4 +59,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: shadps4-linux-qt - path: Shadps4-qt.AppImage + path: Shadps4-qt.AppImage \ No newline at end of file diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9ebcb263..d8dc8846 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -55,4 +55,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: shadps4-sdl-appimage - path: Shadps4-sdl.AppImage + path: Shadps4-sdl.AppImage \ No newline at end of file diff --git a/.github/workflows/windows-qt.yml b/.github/workflows/windows-qt.yml index 1a690a98..12722cd5 100644 --- a/.github/workflows/windows-qt.yml +++ b/.github/workflows/windows-qt.yml @@ -21,7 +21,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive @@ -29,7 +29,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: arch: win64_msvc2019_64 - version: 6.6.1 + version: 6.7.0 - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. @@ -49,7 +49,7 @@ jobs: windeployqt --dir upload upload/shadps4.exe - name: Upload executable - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: shadps4-win64-qt - path: upload + path: upload \ No newline at end of file diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 88fb8970..fba4626a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,7 +20,7 @@ jobs: build: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Configure CMake @@ -31,11 +31,11 @@ jobs: # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel - name: Upload a Build Artifact - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v4 with: name: shadps4-win64 # A file, directory or wildcard pattern that describes what to upload path: | ${{github.workspace}}/build/Release/shadps4.exe ${{github.workspace}}/build/Release/SDL3.dll - ${{github.workspace}}/build/Release/libwinpthread-1.dll + ${{github.workspace}}/build/Release/libwinpthread-1.dll \ No newline at end of file