WIP

.github/workflows/desktop-build.yml

@@ -272,15 +272,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
 
-      - name: Install dependencies using Homebrew
-        shell: bash
-        # CMake cannot find the MySQL connector
-        # Neither of these works: mariadb-connector-c mysql-connector-c++
-        env:
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
-        run: |
-          brew update
-          brew install ccache protobuf qt --force-bottle
+      - name: Setup vcpkg cache
+        id: vcpkg-cache
+        uses: TAServers/vcpkg-cache@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Restore compiler cache (ccache)
         id: ccache_restore
@@ -304,6 +300,8 @@ jobs:
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
+          VCPKG_DISABLE_METRICS: 1
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
         run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE"
 
       - name: Save compiler cache (ccache)
@@ -424,16 +422,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Install Qt ${{matrix.qt_version}}
-        uses: jurplel/install-qt-action@v4
-        with:
-          cache: true
-          setup-python: true
-          version: ${{matrix.qt_version}}
-          arch: win64_${{matrix.qt_arch}}
-          tools: ${{matrix.qt_tools}}
-          modules: ${{matrix.qt_modules}}
-
       - name: Setup vcpkg cache
         id: vcpkg-cache
         uses: TAServers/vcpkg-cache@v3

CMakeLists.txt

@@ -48,8 +48,8 @@ if(USE_CCACHE)
   endif()
 endif()
 
-if(WIN32)
-  # Use vcpkg toolchain on Windows
+if(WIN32 OR APPLE)
+  # Use vcpkg toolchain on Windows and macOS
   set(CMAKE_TOOLCHAIN_FILE
       ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
       CACHE STRING "Vcpkg toolchain file"

vcpkg.json

@@ -6,6 +6,7 @@
     "openssl",
     "protobuf",
     "pthreads",
+    "qt",
     "zlib"
   ]
 }