Update Workflows
This commit is contained in:
parent
96cf59efea
commit
18326adb6c
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
@ -15,4 +14,4 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: fsfe/reuse-action@v1
|
- uses: fsfe/reuse-action@v3
|
|
@ -19,10 +19,10 @@ jobs:
|
||||||
- name: Install
|
- name: Install
|
||||||
run: |
|
run: |
|
||||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
||||||
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
|
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main'
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install clang-format-17
|
sudo apt install clang-format-18
|
||||||
- name: Build
|
- name: Build
|
||||||
env:
|
env:
|
||||||
COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
|
COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
|
||||||
run: ./.ci/clang-format.sh
|
run: ./.ci/clang-format.sh
|
|
@ -12,7 +12,7 @@ on:
|
||||||
env:
|
env:
|
||||||
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
|
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
CLANG_VER: 17
|
CLANG_VER: 18
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
@ -38,10 +38,10 @@ jobs:
|
||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v3
|
uses: jurplel/install-qt-action@v3
|
||||||
with:
|
with:
|
||||||
version: 6.6.1
|
version: 6.7.0
|
||||||
host: linux
|
host: linux
|
||||||
target: desktop
|
target: desktop
|
||||||
#arch: clang++-17
|
#arch: clang++-18
|
||||||
dir: ${{ runner.temp }}
|
dir: ${{ runner.temp }}
|
||||||
#modules: qtcharts qt3d
|
#modules: qtcharts qt3d
|
||||||
setup-python: false
|
setup-python: false
|
||||||
|
@ -59,4 +59,4 @@ jobs:
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: shadps4-linux-qt
|
name: shadps4-linux-qt
|
||||||
path: Shadps4-qt.AppImage
|
path: Shadps4-qt.AppImage
|
|
@ -13,7 +13,7 @@ on:
|
||||||
env:
|
env:
|
||||||
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
|
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
CLANG_VER: 17
|
CLANG_VER: 18
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
@ -55,4 +55,4 @@ jobs:
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: shadps4-sdl-appimage
|
name: shadps4-sdl-appimage
|
||||||
path: Shadps4-sdl.AppImage
|
path: Shadps4-sdl.AppImage
|
|
@ -21,7 +21,7 @@ jobs:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ jobs:
|
||||||
uses: jurplel/install-qt-action@v3
|
uses: jurplel/install-qt-action@v3
|
||||||
with:
|
with:
|
||||||
arch: win64_msvc2019_64
|
arch: win64_msvc2019_64
|
||||||
version: 6.6.1
|
version: 6.7.0
|
||||||
|
|
||||||
- name: Configure CMake
|
- 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.
|
# 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
|
windeployqt --dir upload upload/shadps4.exe
|
||||||
|
|
||||||
- name: Upload executable
|
- name: Upload executable
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: shadps4-win64-qt
|
name: shadps4-win64-qt
|
||||||
path: upload
|
path: upload
|
|
@ -20,7 +20,7 @@ jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- name: Configure CMake
|
- name: Configure CMake
|
||||||
|
@ -31,11 +31,11 @@ jobs:
|
||||||
# Build your program with the given configuration
|
# Build your program with the given configuration
|
||||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
|
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
|
||||||
- name: Upload a Build Artifact
|
- name: Upload a Build Artifact
|
||||||
uses: actions/upload-artifact@v3.1.2
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: shadps4-win64
|
name: shadps4-win64
|
||||||
# A file, directory or wildcard pattern that describes what to upload
|
# A file, directory or wildcard pattern that describes what to upload
|
||||||
path: |
|
path: |
|
||||||
${{github.workspace}}/build/Release/shadps4.exe
|
${{github.workspace}}/build/Release/shadps4.exe
|
||||||
${{github.workspace}}/build/Release/SDL3.dll
|
${{github.workspace}}/build/Release/SDL3.dll
|
||||||
${{github.workspace}}/build/Release/libwinpthread-1.dll
|
${{github.workspace}}/build/Release/libwinpthread-1.dll
|
Loading…
Reference in New Issue