ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: Change Windows builders to VS2022

This commit is contained in:
Connor McLaughlin 2022-11-20 15:03:59 +10:00 committed by lightningterror
parent d54dab87ef
commit 8f4e01e004
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/windows_build_qt.yml vendored
View File

@ -9,7 +9,7 @@ on:
os: os:
required: false required: false
type: string type: string
default: windows-2019 default: windows-2022
platform: platform:
required: false required: false
type: string type: string
@ -91,14 +91,14 @@ jobs:
id: cmake id: cmake
shell: cmd shell: cmd
run: | run: |
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
cmake . -B build "-DCMAKE_PREFIX_PATH=%cd%\${{ inputs.qt_dir }}" -DQT_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja cmake . -B build "-DCMAKE_PREFIX_PATH=%cd%\${{ inputs.qt_dir }}" -DQT_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja
- name: Build PCSX2 - name: Build PCSX2
shell: cmd shell: cmd
run: | run: |
if "${{ inputs.configuration }}"=="CMake" ( if "${{ inputs.configuration }}"=="CMake" (
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
cmake --build build --config Release || exit /b cmake --build build --config Release || exit /b
cmake --install build --config Release || exit /b cmake --install build --config Release || exit /b
) else ( ) else (

8
.github/workflows/windows_build_wx.yml vendored
View File

@ -9,7 +9,7 @@ on:
os: os:
required: false required: false
type: string type: string
default: windows-2019 default: windows-2022
platform: platform:
required: false required: false
type: string type: string
@ -76,7 +76,7 @@ jobs:
shell: cmd shell: cmd
run: | run: |
if "${{ inputs.platform }}"=="Win32" (SET vcvars=vcvarsamd64_x86.bat) else (SET vcvars=vcvars64.bat) if "${{ inputs.platform }}"=="Win32" (SET vcvars=vcvarsamd64_x86.bat) else (SET vcvars=vcvars64.bat)
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\%vcvars%" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\%vcvars%"
echo vcvars=%vcvars%>> %GITHUB_OUTPUT% echo vcvars=%vcvars%>> %GITHUB_OUTPUT%
cmake . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja cmake . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja
@ -84,7 +84,7 @@ jobs:
shell: cmd shell: cmd
run: | run: |
if "${{ inputs.configuration }}"=="CMake" ( if "${{ inputs.configuration }}"=="CMake" (
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ steps.cmake.outputs.vcvars }}" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\${{ steps.cmake.outputs.vcvars }}"
cmake --build build --config Release || exit /b cmake --build build --config Release || exit /b
cp build/pcsx2/pcsx2* bin/ cp build/pcsx2/pcsx2* bin/
) else ( ) else (
@ -95,7 +95,7 @@ jobs:
if: inputs.configuration == 'CMake' if: inputs.configuration == 'CMake'
shell: cmd shell: cmd
run: | run: |
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ steps.cmake.outputs.vcvars }}" call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\${{ steps.cmake.outputs.vcvars }}"
cmake --build build --config Release --target unittests cmake --build build --config Release --target unittests
- name: Upload artifact - name: Upload artifact