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

cleanup

Browse source
This commit is contained in:
tooomm 2026-09-19 18:44:09 +02:00
parent 12277eb4c1
commit 408620b548
1 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -368,13 +368,26 @@ jobs:
key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }} key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }}
path: ${{ env.CCACHE_DIR }} path: ${{ env.CCACHE_DIR }}
# - name: "[macOS] Restore thin Qt ${{ matrix.qt_version }} libraries" - name: "[macOS] Install aqtinstall"
# if: matrix.os == 'macOS' if: matrix.os == 'macOS'
# id: restore_qt run: pipx install aqtinstall
# uses: actions/cache/restore@v6
# with: # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases
# key: thin-qt-macos-${{ matrix.soc }}-${{ matrix.qt_version }} - name: "[macOS] Resolve latest Qt from ${{ matrix.qt_version }} input"
# path: ${{ github.workspace }}/Qt if: matrix.os == 'macOS'
env:
QT_VERSION: ${{ matrix.qt_version }}
id: resolve_qt_version
shell: bash
run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION"
- name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }}"
if: matrix.os == 'macOS'
id: restore_qt
uses: actions/cache/restore@v6
with:
key: Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS-${{ matrix.soc }}-${{ matrix.qt_modules }}-thin
path: ${{ github.workspace }}/Qt
# Using jurplel/install-qt-action to install Qt without using brew # Using jurplel/install-qt-action to install Qt without using brew
# Qt build using vcpkg either just fails or takes too long to build # Qt build using vcpkg either just fails or takes too long to build
@ -382,21 +395,21 @@ jobs:
if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
cache: true cache: false
dir: ${{ github.workspace }} # cache-key-prefix: Qt
modules: ${{ matrix.qt_modules }} modules: ${{ matrix.qt_modules }}
version: ${{ matrix.qt_version }} version: ${{ matrix.qt_version }}
# - name: "[macOS] Create thin Qt libraries" - name: "[macOS] Create thin Qt libraries"
# if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
# run: .ci/thin_macos_qtlib.sh run: .ci/thin_macos_qtlib.sh
# - name: "[macOS] Cache thin Qt libraries" - name: "[macOS] Cache thin Qt libraries"
# if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
# uses: actions/cache/save@v6 uses: actions/cache/save@v6
# with: with:
# key: ${{ steps.restore_qt.outputs.cache-primary-key }} key: ${{ steps.restore_qt.outputs.cache-primary-key }}
# path: ${{ github.workspace }}/Qt path: ${{ github.workspace }}/Qt
- name: "[Windows] Install Qt ${{ matrix.qt_version }}" - name: "[Windows] Install Qt ${{ matrix.qt_version }}"
if: matrix.os == 'Windows' if: matrix.os == 'Windows'