From 4ba7a9174e87daf72739d8e1b977699a1afa1886 Mon Sep 17 00:00:00 2001 From: DavidXanatos Date: Sat, 30 Jan 2021 23:23:57 +0100 Subject: [PATCH] Update main.yml --- .github/workflows/main.yml | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cbb5e172..887050b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,23 +47,6 @@ jobs: # 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 uses: jurplel/install-qt-action@v2 with: @@ -74,9 +57,30 @@ jobs: # tools: 'tools_qtcreator,4.14.0-0-202012170949,qt.tools.qtcreator' 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 # run: SandboxiePlus\qmake_plus.cmd ${{ matrix.platform }} 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