mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-30 10:33:54 -07:00
Disable Qt slimming and manual caching (use build-in fat caching)
This commit is contained in:
parent
2845c729c4
commit
a28cd6b66b
1 changed files with 17 additions and 17 deletions
34
.github/workflows/desktop-build.yml
vendored
34
.github/workflows/desktop-build.yml
vendored
|
|
@ -373,13 +373,13 @@ jobs:
|
||||||
path: ${{ env.CCACHE_DIR }}
|
path: ${{ env.CCACHE_DIR }}
|
||||||
restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
|
restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
|
||||||
|
|
||||||
- name: "[macOS] Restore thin Qt ${{ matrix.qt_version }} libraries"
|
# - name: "[macOS] Restore thin Qt ${{ matrix.qt_version }} libraries"
|
||||||
if: matrix.os == 'macOS'
|
# if: matrix.os == 'macOS'
|
||||||
id: restore_qt
|
# id: restore_qt
|
||||||
uses: actions/cache/restore@v5
|
# uses: actions/cache/restore@v5
|
||||||
with:
|
# with:
|
||||||
key: thin-qt-macos-${{ matrix.soc }}-${{ matrix.qt_version }}
|
# key: thin-qt-macos-${{ matrix.soc }}-${{ matrix.qt_version }}
|
||||||
path: ${{ github.workspace }}/Qt
|
# 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
|
||||||
|
|
@ -388,21 +388,21 @@ jobs:
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
arch: ${{ matrix.qt_arch }}
|
arch: ${{ matrix.qt_arch }}
|
||||||
cache: false
|
cache: true
|
||||||
dir: ${{ github.workspace }}
|
dir: ${{ github.workspace }}
|
||||||
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@v5
|
# uses: actions/cache/save@v5
|
||||||
with:
|
# with:
|
||||||
key: thin-qt-macos-${{ matrix.soc }}-${{ matrix.qt_version }}
|
# key: thin-qt-macos-${{ matrix.soc }}-${{ matrix.qt_version }}
|
||||||
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'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue