From 8f5cc8e64e851ade826fd321124a73e672a93e00 Mon Sep 17 00:00:00 2001 From: Vasyl Skorych Date: Tue, 8 Oct 2024 00:31:57 +0200 Subject: [PATCH] ci: Fix Windows build --- .github/workflows/build_windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index af4ac06..049f0d8 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -125,7 +125,7 @@ jobs: QtToolsPath: ${{env.QT_ROOT_DIR}}/bin QtMsBuild: ${{github.workspace}}/ExternalLibraries/qtvsaddin/QtMsBuild # Add additional options to the MSBuild command line here: see https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference. - run: msbuild -maxCpuCount -verbosity:minimal -property:Configuration=${{env.BUILD_CONFIGURATION}} -property:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} + run: msbuild -maxCpuCount -verbosity:minimal -p:Zm=100 -property:Configuration=${{env.BUILD_CONFIGURATION}} -property:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} installer: runs-on: windows-latest @@ -233,15 +233,15 @@ jobs: QtToolsPath: ${{env.QT_ROOT_DIR}}/bin QtMsBuild: ${{github.workspace}}/ExternalLibraries/qtvsaddin/QtMsBuild run: | - msbuild -maxCpuCount -verbosity:minimal -property:Configuration=Debug -property:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} - msbuild -maxCpuCount -verbosity:minimal -property:Configuration=Release -property:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} + msbuild -maxCpuCount -verbosity:minimal -p:Zm=100 -property:Configuration=Debug -property:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} + msbuild -maxCpuCount:3 -verbosity:minimal -p:Zm=100 -property:Configuration=Release -property:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} - name: Build Installer working-directory: ${{github.workspace}} env: QtToolsPath: ${{env.QT_ROOT_DIR}}/bin QtMsBuild: ${{github.workspace}}/ExternalLibraries/qtvsaddin/QtMsBuild - run: msbuild -maxCpuCount -verbosity:minimal -property:Configuration=${{env.BUILD_CONFIGURATION}} -property:Platform=${{env.BUILD_PLATFORM}} -property:SolutionDir=${{github.workspace}}/ -property:SolutionPath=${{github.workspace}}/${{env.SOLUTION_FILE_NAME}} -property:QtInstallDir=${{github.workspace}}/ExternalLibraries/qt/Qt/${{env.QT_VERSION}}/${{env.QT_VS_VERSION}}/ ${{env.INSTALLER_PROJECT_PATH}} + run: msbuild -maxCpuCount -verbosity:minimal -p:Zm=100 -property:Configuration=${{env.BUILD_CONFIGURATION}} -property:Platform=${{env.BUILD_PLATFORM}} -property:SolutionDir=${{github.workspace}}/ -property:SolutionPath=${{github.workspace}}/${{env.SOLUTION_FILE_NAME}} -property:QtInstallDir=${{github.workspace}}/ExternalLibraries/qt/Qt/${{env.QT_VERSION}}/${{env.QT_VS_VERSION}}/ ${{env.INSTALLER_PROJECT_PATH}} - name: Run Installer shell: pwsh @@ -271,7 +271,7 @@ jobs: shell: pwsh run: | $UnInstallerFile = Resolve-Path "${{ env.LOCALAPPDATA_DIR }}/Programs/MUSEN/unins000.exe" - Start-Process -FilePath $UnInstallerFile -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /skipaskconfig=yes" -Wait + Start-Process -FilePath $UnInstallerFile -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART" -Wait release: runs-on: windows-latest