jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CI: Use windows-2022 image with Visual Studio 17 2022 (#4999)

Browse source 
Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
This commit is contained in:
tooomm 2024-05-13 23:41:50 +02:00 • committed by GitHub
parent 2303880b87
commit 872c92a244
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/desktop-build.yml vendored
View file

@ -317,14 +317,16 @@ jobs:
name: Windows ${{matrix.target}} name: Windows ${{matrix.target}}
needs: configure needs: configure
runs-on: windows-2019 runs-on: windows-2022
env: env:
CMAKE_GENERATOR: 'Visual Studio 16 2019' CMAKE_GENERATOR: 'Visual Studio 17 2022'
steps: steps:
- name: Add msbuild to PATH - name: Add msbuild to PATH
id: add-msbuild id: add-msbuild
uses: microsoft/setup-msbuild@v2 uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4

2
cmake/FindVCredistRuntime.cmake
View file

@ -24,7 +24,7 @@ if(WIN32)
get_filename_component(_path ${_path}/../../ ABSOLUTE) get_filename_component(_path ${_path}/../../ ABSOLUTE)
foreach(redist_file ${REDIST_FILE_NAMES}) foreach(redist_file ${REDIST_FILE_NAMES})
if(EXISTS "${_path}/${REDIST_FILE}") if(EXISTS "${_path}/${redist_file}")
set(VCREDISTRUNTIME_FOUND "YES") set(VCREDISTRUNTIME_FOUND "YES")
set(VCREDISTRUNTIME_FILE ${_path}/${redist_file}) set(VCREDISTRUNTIME_FILE ${_path}/${redist_file})
break() break()

12
cmake/NSIS.template.in
View file

@ -248,20 +248,20 @@ ${If} $PortableMode = 0
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@"
IfFileExists "$INSTDIR\vcredist_x86.exe" VcRedist86Exists PastVcRedist86Check IfFileExists "$INSTDIR\vc_redist.x86.exe" VcRedist86Exists PastVcRedist86Check
VcRedist86Exists: VcRedist86Exists:
ExecWait '"$INSTDIR\vcredist_x86.exe" /passive /norestart' ExecWait '"$INSTDIR\vc_redist.x86.exe" /passive /norestart'
DetailPrint "Wait to ensure unlock of vc_redist file after installation..." DetailPrint "Wait to ensure unlock of vc_redist file after installation..."
Sleep 3000 Sleep 3000
Delete "$INSTDIR\vcredist_x86.exe" Delete "$INSTDIR\vc_redist.x86.exe"
PastVcRedist86Check: PastVcRedist86Check:
IfFileExists "$INSTDIR\vcredist_x64.exe" VcRedist64Exists PastVcRedist64Check IfFileExists "$INSTDIR\vc_redist.x64.exe" VcRedist64Exists PastVcRedist64Check
VcRedist64Exists: VcRedist64Exists:
ExecWait '"$INSTDIR\vcredist_x64.exe" /passive /norestart' ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart'
DetailPrint "Sleep to ensure unlock of vc_redist file after installation..." DetailPrint "Sleep to ensure unlock of vc_redist file after installation..."
Sleep 3000 Sleep 3000
Delete "$INSTDIR\vcredist_x64.exe" Delete "$INSTDIR\vc_redist.x64.exe"
PastVcRedist64Check: PastVcRedist64Check:
${Else} ${Else}