jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 14:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Bruno Alexandre Rosa 2025-09-21 20:37:52 -03:00
parent 3501ee9a9d
commit e229c12b93
3 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.github/workflows/desktop-build.yml vendored
View file

@ -272,15 +272,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v5 uses: actions/checkout@v5
- name: Install dependencies using Homebrew - name: Setup vcpkg cache
shell: bash id: vcpkg-cache
# CMake cannot find the MySQL connector uses: TAServers/vcpkg-cache@v3
# Neither of these works: mariadb-connector-c mysql-connector-c++ with:
env: token: ${{ secrets.GITHUB_TOKEN }}
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
run: |
brew update
brew install ccache protobuf qt --force-bottle
- name: Restore compiler cache (ccache) - name: Restore compiler cache (ccache)
id: ccache_restore id: ccache_restore
@ -304,6 +300,8 @@ jobs:
MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }} MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }} MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}' 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" run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE"
- name: Save compiler cache (ccache) - name: Save compiler cache (ccache)
@ -424,16 +422,6 @@ jobs:
with: with:
submodules: recursive 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 - name: Setup vcpkg cache
id: vcpkg-cache id: vcpkg-cache
uses: TAServers/vcpkg-cache@v3 uses: TAServers/vcpkg-cache@v3

4
CMakeLists.txt
View file

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

1
vcpkg.json
View file

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