diff --git a/.github/workflows/rssguard.yml b/.github/workflows/rssguard.yml index 7dfa3a41f..f2c5e6ddc 100755 --- a/.github/workflows/rssguard.yml +++ b/.github/workflows/rssguard.yml @@ -27,12 +27,5 @@ jobs: with: fetch-depth: 0 submodules: true - - name: Add msbuild to PATH - if: runner.os == 'Windows' - uses: microsoft/setup-msbuild@v1.0.2 - - name: tst - if: runner.os == 'Windows' - shell: cmd - run: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - name: Prepare environment and compile application run: ${{ matrix.script_name }} "${{ matrix.os }}" "${{ matrix.use_webengine }}" \ No newline at end of file diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index ec428f1d5..ab08064db 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -7,7 +7,9 @@ echo "OS: $os; WebEngine: $webengine" $old_pwd = $pwd.Path # Prepare environment. -cmd.exe /k "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" `& powershell +Install-Module Pscx -Scope CurrentUser -AllowClobber -Force +Install-Module VSSetup -Scope CurrentUser -AllowClobber -Force +Import-VisualStudioVars # Get Qt. $qt_version = "5.15.1"