Update main.yml

This commit is contained in:
DavidXanatos 2021-01-30 23:23:57 +01:00 committed by GitHub
parent c33250b09a
commit 4ba7a9174e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 17 deletions

View File

@ -47,23 +47,6 @@ jobs:
# key: ${{ matrix.qt-target }}-QtCache # key: ${{ matrix.qt-target }}-QtCache
- name: Install Qt 32 bit
uses: jurplel/install-qt-action@v2
with:
version: '5.15.1'
dir: ..
# arch: ${{ matrix.qt-target }}
arch: 'win32_msvc2019'
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
cached: ${{ steps.cache-qt.outputs.cache-hit }}
- name: Build Sandboxie-Plus 32 bit
# run: SandboxiePlus\qmake_plus.cmd ${{ matrix.platform }}
run: SandboxiePlus\qmake_plus.cmd Win32
- name: Install Qt 64 bit - name: Install Qt 64 bit
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
@ -74,9 +57,30 @@ jobs:
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator' # tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
cached: ${{ steps.cache-qt.outputs.cache-hit }} cached: ${{ steps.cache-qt.outputs.cache-hit }}
- name: Install Qt 32 bit
uses: jurplel/install-qt-action@v2
with:
version: '5.15.1'
dir: ..
# arch: ${{ matrix.qt-target }}
arch: 'win32_msvc2019'
# tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator'
cached: ${{ steps.cache-qt.outputs.cache-hit }}
- name: Installing Jom
# run: SandboxiePlus\qmake_plus.cmd ${{ matrix.platform }}
run: SandboxiePlus\install_jom.cmd
- name: Build Sandboxie-Plus 64 bit - name: Build Sandboxie-Plus 64 bit
# run: SandboxiePlus\qmake_plus.cmd ${{ matrix.platform }} # run: SandboxiePlus\qmake_plus.cmd ${{ matrix.platform }}
run: SandboxiePlus\qmake_plus.cmd x64 run: SandboxiePlus\qmake_plus.cmd x64
- name: Build Sandboxie-Plus 32 bit
# run: SandboxiePlus\qmake_plus.cmd ${{ matrix.platform }}
run: SandboxiePlus\qmake_plus.cmd Win32
#- name: Merging Builds #- name: Merging Builds