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

Merge branch 'master' into tooomm-ci_qt-install-action

Browse source
This commit is contained in:
tooomm 2026-06-27 17:53:21 +02:00 • committed by GitHub
commit 1b246548bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 217 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,7 +162,7 @@ jobs:
- name: "Restore compiler cache (ccache)"
id: ccache_restore
uses: actions/cache/restore@v5
uses: actions/cache/restore@v6
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
with:
@ -215,7 +215,7 @@ jobs:
- name: "Save updated compiler cache (ccache)"
if: github.ref == 'refs/heads/master'
uses: actions/cache/save@v5
uses: actions/cache/save@v6
with:
key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
path: ${{ env.CACHE }}
@ -365,7 +365,7 @@ jobs:
- name: "[macOS] Restore compiler cache (ccache)"
if: matrix.os == 'macOS' && matrix.use_ccache == 1
id: ccache_restore
uses: actions/cache/restore@v5
uses: actions/cache/restore@v6
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
with:
@ -376,7 +376,7 @@ jobs:
# - name: "[macOS] Restore thin Qt ${{ matrix.qt_version }} libraries"
# if: matrix.os == 'macOS'
# id: restore_qt
# uses: actions/cache/restore@v5
# uses: actions/cache/restore@v6
# with:
# key: thin-qt-macos-${{ matrix.soc }}-${{ matrix.qt_version }}
# path: ${{ github.workspace }}/Qt
@ -399,7 +399,7 @@ jobs:
# - name: "[macOS] Cache thin Qt libraries"
# if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
# uses: actions/cache/save@v5
# uses: actions/cache/save@v6
# with:
# key: thin-qt-macos-${{ matrix.soc }}-${{ matrix.qt_version }}
# path: ${{ github.workspace }}/Qt
@ -462,7 +462,7 @@ jobs:
- name: "[macOS] Save updated compiler cache (ccache)"
if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master'
uses: actions/cache/save@v5
uses: actions/cache/save@v6
with:
key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
path: ${{ env.CCACHE_DIR }}