X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=.github%2Fworkflows%2Fmain.yml;h=661e8b73929830a860fa02f7887a614b0a91d3ff;hb=7064a9e9b8aec31aca5ac88b4a5190a50dfc84c7;hp=6dab044e7e56fef13f69838e6afc570d3c1c6243;hpb=48fd5ba54406c1140de7123d48d65f117b2053e7;p=quassel.git

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6dab044e..661e8b73 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dist: [ debian-stable, debian-testing, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal ]
-        cxx: [ gcc, clang++ ]
+        dist: [ debian-stable, debian-testing, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy ]
+        cxx: [ 'g++', 'clang++' ]
         with-kde: [ -DWITH_KDE=ON ]
         extra-options: [ -DWITH_WEBENGINE=ON ]
         include:
@@ -39,6 +39,7 @@ jobs:
         CCACHE_BASEDIR: ${{ github.workspace }}
         CCACHE_DIR: ${{ github.workspace }}/ccache
         CCACHE_MAXSIZE: 100M
+        CXX: ${{ matrix.cxx }}
 
     steps:
     - name: Check out source code
@@ -92,6 +93,13 @@ jobs:
       CCACHE_MAXSIZE: 100M
 
     steps:
+    - name: Select Xcode version
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        # Newer Xcode versions may not officially be supported by Qt
+        # Check https://doc.qt.io/qt-5/macos.html
+        xcode-version: '12.4.0'
+
     - name: Check out source code
       uses: actions/checkout@v2
       with:
@@ -113,7 +121,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
@@ -135,24 +143,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
@@ -161,7 +170,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: macOS
-        path: ${{ github.workspace }}/build/*.dmg
+        path: ${{ github.workspace }}/bundles/*.dmg
 
 # ------------------------------------------------------------------------------------------------------------------------------------------
   build-windows: