From fffb03a2422a9a4b13a603a3cf0a6b452844e46d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Fri, 13 May 2022 19:48:17 +0200 Subject: [PATCH] release-windows.yml: use windows-2022 (#3939) --- .github/workflows/release-windows.yml | 4 ++-- win_installer/config.wxi | 4 ++-- win_installer/readme.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index a6a48026e..b250fc9a4 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -20,7 +20,7 @@ jobs: build: - runs-on: windows-2019 + runs-on: windows-2022 env: # see https://www.pcre.org/original/changelog.txt @@ -49,7 +49,7 @@ jobs: run: | 7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel! cd pcre-%PCRE_VERSION% || exit /b !errorlevel! - cmake . -G "Visual Studio 16 2019" -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF || exit /b !errorlevel! + cmake . -G "Visual Studio 17 2022" -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF || exit /b !errorlevel! msbuild -m PCRE.sln -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel! copy pcre.h ..\externals || exit /b !errorlevel! copy Release\pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel! diff --git a/win_installer/config.wxi b/win_installer/config.wxi index 4b6853a91..b0abe765f 100644 --- a/win_installer/config.wxi +++ b/win_installer/config.wxi @@ -10,10 +10,10 @@ - + - + diff --git a/win_installer/readme.txt b/win_installer/readme.txt index afe465430..aa69e4a10 100644 --- a/win_installer/readme.txt +++ b/win_installer/readme.txt @@ -32,7 +32,7 @@ Before building the installer make sure all the components are build: And that runtime files are available: - Qt runtimes: Qt5Core.dll, Qt5PrintSupport.dll, Qt5Widgets.dll, Qt5Gui.dll and platforms/qwindows.dll - - MS CRT merge module (Microsoft_VC140_CRT_x86.msm or Microsoft_VC140_CRT_x64.msm) + - MS CRT merge module (Microsoft_VC143_CRT_x86.msm or Microsoft_VC143_CRT_x64.msm) Build installer by giving this command line in VS command prompt (or run vcvars32.bat in DOS prompt first to setup environment):