diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f0fe67c..5ee03506 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: "qmake" cmd: "./build.sh" - name: "cmake" - cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release" + cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3" name: build-ubuntu-${{ matrix.toolchain.name }} steps: @@ -54,9 +54,20 @@ jobs: build-windows: runs-on: windows-latest + strategy: + fail-fast: false + matrix: + toolchain: + - name: "qmake" + cmd: "./build.sh release" + - name: "cmake" + cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release-win64 -j2" + name: build-windows-${{ matrix.toolchain.name }} steps: - uses: actions/checkout@v1 + with: + submodules: recursive - uses: eine/setup-msys2@v0 with: update: true @@ -65,6 +76,6 @@ jobs: - name: disable qtquickcompiler run: msys2do sed -i s/CONFIG\ +=\ qtquickcompiler// monero-wallet-gui.pro - name: build - run: msys2do ./build.sh release + run: msys2do ${{ matrix.toolchain.cmd }} - name: test qml run: msys2do build/release/bin/monero-wallet-gui --test-qml diff --git a/monero b/monero index 77a008f7..992b7ce3 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 77a008f71454ce4dd4bce033bc0319a49e2cec51 +Subproject commit 992b7ce30fa101f55314b89aa5bdf20881f5b43d