Merge pull request #3102

270b86b workflows: remove qmake (selsta)

1 files changed, 3 insertions, 38 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af6cf0b6..9941bcd1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,18 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build-macos:
-
     runs-on: macOS-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        toolchain:
-          - name: "qmake"
-            cmd: "export PATH=$PATH:/usr/local/opt/qt/bin && ./build.sh"
-          - name: "cmake"
-            cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3"
-    name: build-macos-${{ matrix.toolchain.name }}
-
     steps:
     - uses: actions/checkout@v1
       with:
@@ -23,23 +12,12 @@ jobs:
     - name: update brew and install dependencies
       run: brew update && brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf qt5 pkg-config
     - name: build
-      run: ${{ matrix.toolchain.cmd }}
+      run: USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3
     - name: test qml
       run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml
 
   build-ubuntu:
-
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        toolchain:
-          - name: "qmake"
-            cmd: "./build.sh"
-          - name: "cmake"
-            cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3"
-    name: build-ubuntu-${{ matrix.toolchain.name }}
-
     steps:
     - uses: actions/checkout@v1
       with:
@@ -58,26 +36,15 @@ jobs:
     - name: install monero gui dependencies
       run: sudo apt -y install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev libgcrypt20-dev xvfb
     - name: build
-      run: ${{ matrix.toolchain.cmd }}
+      run: USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3
     - name: test qml
       run: xvfb-run -a build/release/bin/monero-wallet-gui --test-qml
 
   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 }}
     defaults:
       run:
         shell: msys2 {0}
-
     steps:
     - uses: actions/checkout@v1
       with:
@@ -87,8 +54,6 @@ jobs:
         update: true
         install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
     - name: build
-      run: |
-        sed -i 's/CONFIG\ +=\ qtquickcompiler//' monero-wallet-gui.pro
-        ${{ matrix.toolchain.cmd }}
+      run: USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release-win64 -j2
     - name: test qml
       run: build/release/bin/monero-wallet-gui --test-qml