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

CI: Resolve to latest Qt version in range for Windows as well

Browse source
This commit is contained in:
tooomm 2026-03-14 19:45:32 +01:00 • committed by GitHub
parent 8180d2e3b0
commit e52c2bb2f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,10 +366,8 @@ jobs:
# Checking if there's a newer, uncached version of Qt available to install via aqtinstall # Checking if there's a newer, uncached version of Qt available to install via aqtinstall
- name: Resolve latest Qt patch version - name: Resolve latest Qt patch version
if: matrix.os == 'macOS'
id: resolve_qt_version id: resolve_qt_version
shell: bash shell: bash
# Ouputs the version of Qt to install via aqtinstall
run: .ci/resolve_latest_aqt_qt_version.sh "${{matrix.qt_version}}" run: .ci/resolve_latest_aqt_qt_version.sh "${{matrix.qt_version}}"
- name: Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries (${{ matrix.soc }} macOS) - name: Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries (${{ matrix.soc }} macOS)
@ -386,10 +384,10 @@ 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: false
version: ${{ steps.resolve_qt_version.outputs.version }} version: ${{ steps.resolve_qt_version.outputs.version }}
arch: ${{matrix.qt_arch}} arch: ${{matrix.qt_arch}}
modules: ${{matrix.qt_modules}} modules: ${{matrix.qt_modules}}
cache: false
dir: ${{github.workspace}} dir: ${{github.workspace}}
- name: Thin Qt libraries (${{ matrix.soc }} macOS) - name: Thin Qt libraries (${{ matrix.soc }} macOS)
@ -407,7 +405,7 @@ jobs:
if: matrix.os == 'Windows' if: matrix.os == 'Windows'
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: ${{matrix.qt_version}} version: ${{ steps.resolve_qt_version.outputs.version }}
arch: ${{matrix.qt_arch}} arch: ${{matrix.qt_arch}}
modules: ${{matrix.qt_modules}} modules: ${{matrix.qt_modules}}
cache: true cache: true