X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=.github%2Fworkflows%2Fmain.yml;h=2bcfc196d4fb156905e446e139e2176e106a3bde;hp=c0dae8e4403bff59441d0d40d2f689b951c4075a;hb=HEAD;hpb=28eb43dd1ccd882b2975c346297842c1dc074469 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c0dae8e4..e75905f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -120,7 +120,7 @@ jobs: # If Homebrew begins failing in the future due to out-of-date versions, # it can be re-enabled here as follows... # run: brew update && [below command] - run: brew install boost ccache ninja qca qt5 + run: brew install boost ccache ninja qca qt@5 - name: Get timestamp id: get-timestamp @@ -142,24 +142,25 @@ jobs: mkdir build cd build && cmake $GITHUB_WORKSPACE \ -GNinja \ - -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \ + -DWANT_CORE=ON \ + -DWANT_QTCLIENT=ON \ + -DWANT_MONO=ON \ + -DCMAKE_PREFIX_PATH=$(brew --prefix)/opt/qt@5 \ + -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/bundles \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=ON \ -DFATAL_WARNINGS=OFF \ - -DDEPLOY=ON \ - -DENABLE_SHARED=OFF + -DENABLE_SHARED=OFF \ + -DBUNDLE=ON \ - name: Build - run: | - # Deploy scripts require qmake in the path - export PATH=$PATH:/usr/local/opt/qt5/bin - cd build && ninja + run: cd build && ninja - name: Run tests run: cd build && ctest - name: Install - run: cd build && DESTDIR=$GITHUB_WORKSPACE/image ninja install + run: cd build && ninja install - name: Print ccache stats run: ccache -s @@ -168,7 +169,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: macOS - path: ${{ github.workspace }}/build/*.dmg + path: ${{ github.workspace }}/bundles/*.dmg # ------------------------------------------------------------------------------------------------------------------------------------------ build-windows: