Skip to content

Commit

Permalink
Update PageEdit CI to Qt6.6.2 [deploy]
Browse files Browse the repository at this point in the history
  • Loading branch information
dougmassay committed Mar 25, 2024
1 parent 6013e8b commit eecaf00
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/reset-win-caches.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ reset cache on 4 September 2023
reset cache on 9 September 2023
reset cache on 12 October 2023
reset cache on 19 November 2023
reset cache on 25 March 2024

8 changes: 4 additions & 4 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ on:

env:
BUILD_TYPE: Release
DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt6.5.3_x64_VS2022.7z
QT: Qt6.5.3
DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt6.6.2e_x64_VS2022.7z
QT: Qt6.6.2
INNO: C:\Program Files (x86)\Inno Setup 6
CMAKE64BIT: -DWIN_INSTALLER_USE_64BIT_CRT=1

Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
working-directory: ${{runner.workspace}}\build
run: |
set PATH=${{runner.workspace}}\%QT%\bin;%PATH%
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.37
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.38
echo %PATH%
cmake %GITHUB_WORKSPACE% ^
-G "Ninja" ^
Expand All @@ -95,7 +95,7 @@ jobs:
set REDIST=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\%RedistVersion%\vc_redist.x64.exe
echo "%REDIST%"
cp '%REDIST%' %GITHUB_WORKSPACE%\installer\vcredist_x64.exe
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.37
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.38
ninja -j2 deployinstaller
- uses: actions/upload-artifact@v3
Expand Down

0 comments on commit eecaf00

Please sign in to comment.