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

Merge branch 'master' into ci/use-ninja-win

Browse source
This commit is contained in:
Bruno Alexandre Rosa 2026-03-02 23:26:11 -03:00
commit 6bb43e25da
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ permissions:
contents: write contents: write
id-token: write id-token: write
attestations: write attestations: write
actions: write # needed for ccache action to be able to delete gha caches actions: write
on: on:
push: push:
@ -41,7 +41,7 @@ on:
# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master) # Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
concurrency: concurrency:
group: "${{ github.workflow }} @ ${{ github.ref_name }}" group: "${{ github.workflow }} @ ${{ github.ref_name }}"
cancel-in-progress: ${{ github.ref_name != 'master' }} cancel-in-progress: true
jobs: jobs:
configure: configure:
@ -171,7 +171,9 @@ jobs:
with: with:
path: ${{env.CACHE}} path: ${{env.CACHE}}
key: ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}} key: ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}}
restore-keys: ccache-${{matrix.distro}}${{matrix.version}}- restore-keys: |
ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}}-
ccache-${{matrix.distro}}${{matrix.version}}-master-
- name: Build ${{matrix.distro}} ${{matrix.version}} Docker image - name: Build ${{matrix.distro}} ${{matrix.version}} Docker image
shell: bash shell: bash
@ -202,12 +204,12 @@ jobs:
--ccache "$CCACHE_SIZE" $NO_CLIENT --ccache "$CCACHE_SIZE" $NO_CLIENT
.ci/name_build.sh .ci/name_build.sh
# Delete stale ccache so Save can refresh it; failures are non-fatal (e.g. no prior cache)
- name: Delete stale ccache - name: Delete stale ccache
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
env: env:
GH_TOKEN: ${{github.token}} GH_TOKEN: ${{github.token}}
run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || echo "warning: cache delete failed" run: |
gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || true
- name: Save compiler cache (ccache) - name: Save compiler cache (ccache)
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
@ -432,7 +434,7 @@ jobs:
MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }} MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
DEVELOPER_DIR: '/Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer' DEVELOPER_DIR: '/Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer'
TARGET_MACOS_VERSION: ${{ matrix.override_target }} TARGET_MACOS_VERSION: ${{ matrix.override_target }}
run: .ci/compile.sh --server --test --vcpkg --ccache 500M run: .ci/compile.sh --server --test --vcpkg
- name: Sign app bundle - name: Sign app bundle
if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null) if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)

2
cockatrice/src/main.cpp
View file

@ -214,6 +214,7 @@ int main(int argc, char *argv[])
#endif #endif
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
translationPath = qApp->applicationDirPath() + "/../Resources/translations"; translationPath = qApp->applicationDirPath() + "/../Resources/translations";
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
translationPath = qApp->applicationDirPath() + "/translations"; translationPath = qApp->applicationDirPath() + "/translations";
@ -237,6 +238,7 @@ int main(int argc, char *argv[])
} }
rng = new RNG_SFMT; rng = new RNG_SFMT;
const auto bla = 42;
themeManager = new ThemeManager; themeManager = new ThemeManager;
soundEngine = new SoundEngine; soundEngine = new SoundEngine;