mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-08-26 10:45:02 -05:00
Adjust CI
Took 14 minutes
This commit is contained in:
@@ -10,8 +10,10 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
|
||||
ninja \
|
||||
protobuf \
|
||||
qt6-base \
|
||||
qt6-declarative \
|
||||
qt6-imageformats \
|
||||
qt6-multimedia \
|
||||
qt6-shadertools \
|
||||
qt6-svg \
|
||||
qt6-tools \
|
||||
qt6-translations \
|
||||
|
||||
@@ -20,7 +20,9 @@ RUN apt-get update && \
|
||||
qt6-image-formats-plugins \
|
||||
qt6-l10n-tools \
|
||||
qt6-multimedia-dev \
|
||||
qt6-declarative-dev \
|
||||
qt6-svg-dev \
|
||||
qt6-shadertools-dev \
|
||||
qt6-tools-dev \
|
||||
qt6-tools-dev-tools \
|
||||
qt6-websockets-dev \
|
||||
|
||||
@@ -21,7 +21,9 @@ RUN apt-get update && \
|
||||
qt6-image-formats-plugins \
|
||||
qt6-l10n-tools \
|
||||
qt6-multimedia-dev \
|
||||
qt6-declarative-dev \
|
||||
qt6-svg-dev \
|
||||
qt6-shadertools-dev \
|
||||
qt6-tools-dev \
|
||||
qt6-tools-dev-tools \
|
||||
qt6-websockets-dev \
|
||||
|
||||
@@ -8,7 +8,7 @@ RUN dnf install -y \
|
||||
mariadb-devel \
|
||||
ninja-build \
|
||||
protobuf-devel \
|
||||
qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
|
||||
qt6-{qtdeclarative,qtshadertools,qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
|
||||
qt6-qtimageformats \
|
||||
rpm-build \
|
||||
xz-devel \
|
||||
|
||||
@@ -8,7 +8,7 @@ RUN dnf install -y \
|
||||
mariadb-devel \
|
||||
ninja-build \
|
||||
protobuf-devel \
|
||||
qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
|
||||
qt6-{qtdeclarative,qtshadertools,qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
|
||||
qt6-qtimageformats \
|
||||
rpm-build \
|
||||
xz-devel \
|
||||
|
||||
@@ -20,7 +20,9 @@ RUN apt-get update && \
|
||||
qt6-image-formats-plugins \
|
||||
qt6-l10n-tools \
|
||||
qt6-multimedia-dev \
|
||||
qt6-declarative-dev \
|
||||
qt6-svg-dev \
|
||||
qt6-shadertools-dev \
|
||||
qt6-tools-dev \
|
||||
qt6-tools-dev-tools \
|
||||
qt6-websockets-dev \
|
||||
|
||||
@@ -21,7 +21,9 @@ RUN apt-get update && \
|
||||
qt6-image-formats-plugins \
|
||||
qt6-l10n-tools \
|
||||
qt6-multimedia-dev \
|
||||
qt6-declarative-dev \
|
||||
qt6-svg-dev \
|
||||
qt6-shadertools-dev \
|
||||
qt6-tools-dev \
|
||||
qt6-tools-dev-tools \
|
||||
qt6-websockets-dev \
|
||||
|
||||
10
.github/workflows/desktop-build.yml
vendored
10
.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
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative 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
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative 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
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative 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
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative 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
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools
|
||||
type: Release
|
||||
|
||||
name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
|
||||
|
||||
Reference in New Issue
Block a user