mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-08-28 11:45:22 -05:00
Adjust CI again
Took 14 minutes
This commit is contained in:
14
.github/workflows/desktop-build.yml
vendored
14
.github/workflows/desktop-build.yml
vendored
@@ -271,7 +271,7 @@ jobs:
|
||||
override_target: 13
|
||||
package_suffix: "-macOS13_Intel"
|
||||
qt_version: 6.11.0
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
|
||||
soc: Intel
|
||||
type: Release
|
||||
use_ccache: 1
|
||||
@@ -286,7 +286,7 @@ jobs:
|
||||
make_package: 1
|
||||
package_suffix: "-macOS14"
|
||||
qt_version: 6.11.0
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
|
||||
soc: Apple
|
||||
type: Release
|
||||
use_ccache: 1
|
||||
@@ -301,7 +301,7 @@ jobs:
|
||||
make_package: 1
|
||||
package_suffix: "-macOS15"
|
||||
qt_version: 6.11.0
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
|
||||
soc: Apple
|
||||
type: Release
|
||||
use_ccache: 1
|
||||
@@ -314,7 +314,7 @@ jobs:
|
||||
ccache_eviction_age: 7d
|
||||
cmake_generator: Ninja
|
||||
qt_version: 6.11.0
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
|
||||
soc: Apple
|
||||
type: Debug
|
||||
use_ccache: 1
|
||||
@@ -329,7 +329,7 @@ jobs:
|
||||
make_package: 1
|
||||
package_suffix: "-Win10"
|
||||
qt_version: 6.11.0
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools
|
||||
type: Release
|
||||
|
||||
name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
|
||||
@@ -384,7 +384,7 @@ jobs:
|
||||
id: restore_qt
|
||||
uses: actions/cache/restore@v6
|
||||
with:
|
||||
key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
|
||||
key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}-${{ matrix.qt_modules }}
|
||||
path: ${{ github.workspace }}/Qt
|
||||
|
||||
# Using jurplel/install-qt-action to install Qt without using brew
|
||||
@@ -406,7 +406,7 @@ jobs:
|
||||
if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/save@v6
|
||||
with:
|
||||
key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
|
||||
key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}-${{ matrix.qt_modules }}
|
||||
path: ${{ github.workspace }}/Qt
|
||||
|
||||
- name: "[Windows] Install Qt ${{ matrix.qt_version }}"
|
||||
|
||||
Reference in New Issue
Block a user