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

[CI] Utilize version resolution in install-qt-action + cache with full version key (#6993)

Browse source 
* Direct wildcard resolution in action + cache with version key

* add back space

* Delete .ci/resolve_latest_aqt_qt_version.sh

* Disable Qt slimming and manual caching (use build-in fat caching)

* cleanup

* Re-add resolve_latest_aqt_qt_version.sh
This commit is contained in:
tooomm 2026-09-20 16:53:10 +02:00 • committed by GitHub
parent d9cd2d1750
commit ec41c103d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -272,7 +272,7 @@ jobs:
make_package: 1 make_package: 1
override_target: 13 override_target: 13
package_suffix: "-macOS13_Intel" package_suffix: "-macOS13_Intel"
qt_version: 6.11.1 qt_version: 6.11.*
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
soc: Intel soc: Intel
type: Release type: Release
@ -288,7 +288,7 @@ jobs:
make_package: 1 make_package: 1
override_target: 14 override_target: 14
package_suffix: "-macOS14" package_suffix: "-macOS14"
qt_version: 6.11.1 qt_version: 6.11.*
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
soc: Apple soc: Apple
type: Release type: Release
@ -304,7 +304,7 @@ jobs:
make_package: 1 make_package: 1
override_target: 15 override_target: 15
package_suffix: "-macOS15" package_suffix: "-macOS15"
qt_version: 6.11.1 qt_version: 6.11.*
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
soc: Apple soc: Apple
type: Release type: Release
@ -317,7 +317,7 @@ jobs:
ccache_eviction_age: 7d ccache_eviction_age: 7d
cmake_generator: Ninja cmake_generator: Ninja
qt_version: 6.11.1 qt_version: 6.11.*
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
soc: Apple soc: Apple
type: Debug type: Debug
@ -332,7 +332,7 @@ jobs:
cmake_generator_platform: x64 cmake_generator_platform: x64
make_package: 1 make_package: 1
package_suffix: "-Win10" package_suffix: "-Win10"
qt_version: 6.11.1 qt_version: 6.11.*
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
type: Release type: Release
@ -368,18 +368,20 @@ 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: "Install aqtinstall" - name: "[macOS] Install aqtinstall"
if: matrix.os == 'macOS'
run: pipx install aqtinstall run: pipx install aqtinstall
# Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases
- name: "Resolve latest Qt patch version" - name: "[macOS] Resolve latest Qt from ${{ matrix.qt_version }} input"
if: matrix.os == 'macOS'
env: env:
QT_VERSION: ${{ matrix.qt_version }} QT_VERSION: ${{ matrix.qt_version }}
id: resolve_qt_version id: resolve_qt_version
shell: bash shell: bash
run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION" run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION"
- name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries" - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }}"
if: matrix.os == 'macOS' if: matrix.os == 'macOS'
id: restore_qt id: restore_qt
uses: actions/cache/restore@v6 uses: actions/cache/restore@v6
@ -389,14 +391,14 @@ jobs:
# 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
- name: "[macOS] Install fat Qt ${{ steps.resolve_qt_version.outputs.version }}" - name: "[macOS] Install fat Qt ${{ matrix.qt_version }}"
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: false cache: false
dir: ${{ github.workspace }} # cache-key-prefix: Qt
modules: ${{ matrix.qt_modules }} modules: ${{ matrix.qt_modules }}
version: ${{ steps.resolve_qt_version.outputs.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'
@ -418,7 +420,7 @@ jobs:
cache: ${{ github.ref == 'refs/heads/master' }} cache: ${{ github.ref == 'refs/heads/master' }}
cache-key-prefix: Qt cache-key-prefix: Qt
modules: ${{ matrix.qt_modules }} modules: ${{ matrix.qt_modules }}
version: ${{ steps.resolve_qt_version.outputs.version }} version: ${{ matrix.qt_version }}
- name: "[Windows] Install NSIS" - name: "[Windows] Install NSIS"
if: matrix.os == 'Windows' if: matrix.os == 'Windows'