Skip to content

Commit

Permalink
Remove vcredist packaging from Windows CI build [deploy]
Browse files Browse the repository at this point in the history
  • Loading branch information
dougmassay authored Aug 22, 2024
1 parent 708941d commit 8ecc750
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ env:
DOWNLOADQT: https://github.com/dougmassay/win-qtwebkit-5.212/releases/download/v5.212-1/Qt6.7.2ci_x64_VS2022.7z
QT: Qt6.7.2
INNO: C:\Program Files (x86)\Inno Setup 6
CMAKE64BIT: -DWIN_INSTALLER_USE_64BIT_CRT=1

jobs:
build:
Expand Down Expand Up @@ -77,12 +76,10 @@ jobs:
run: |
set PATH=${{runner.workspace}}\%QT%\bin;%PATH%
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
echo %PATH%
cmake %GITHUB_WORKSPACE% ^
-G "Ninja" ^
-DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
-DQt6_DIR="${{runner.workspace}}\$QT\lib\cmake\Qt6" ^
%CMAKE64BIT%
-DQt6_DIR="${{runner.workspace}}\$QT\lib\cmake\Qt6"
ninja -j2
- name: Build Installer
Expand All @@ -91,10 +88,6 @@ jobs:
if: "contains(github.event.head_commit.message, '[deploy]')"
run: |
set PATH=%INNO%;${{runner.workspace}}\%QT%\bin;%PATH%
set /p RedistVersion=<"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCRedistVersion.default.txt"
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
ninja -j2 deployinstaller
Expand All @@ -103,4 +96,4 @@ jobs:
with:
name: pageedit-installer
path: ${{runner.workspace}}\build\deploy\*.exe
retention-days: 5
retention-days: 8

0 comments on commit 8ecc750

Please sign in to comment.