Docker: remove wayland and openblas
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 11m6s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m14s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / build:rpm (rocky8) (push) Successful in 11m44s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 11m40s
Build Packages / Build documentation (push) Successful in 40s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m51s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 12m10s
Build Packages / build:rpm (rocky9) (push) Successful in 12m15s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 5m43s
Build Packages / Unit tests (push) Successful in 53m6s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 11m6s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m14s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / build:rpm (rocky8) (push) Successful in 11m44s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 11m40s
Build Packages / Build documentation (push) Successful in 40s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m51s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 12m10s
Build Packages / build:rpm (rocky9) (push) Successful in 12m15s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 5m43s
Build Packages / Unit tests (push) Successful in 53m6s
This commit is contained in:
@@ -40,7 +40,6 @@ RUN dnf -y update && \
|
||||
xcb-util-devel \
|
||||
libxkbcommon-devel \
|
||||
libxkbcommon-x11-devel \
|
||||
wayland-devel \
|
||||
libX11-devel \
|
||||
libXext-devel \
|
||||
libXrender-devel \
|
||||
@@ -68,9 +67,6 @@ RUN dnf -y update && \
|
||||
python3-setuptools \
|
||||
python3-wheel \
|
||||
twine \
|
||||
openblas \
|
||||
openblas-static \
|
||||
openblas-devel \
|
||||
libdrm-devel \
|
||||
libglvnd-core-devel \
|
||||
libglvnd-devel \
|
||||
@@ -184,7 +180,6 @@ RUN set -eux; \
|
||||
-DQT_FEATURE_xcb=ON \
|
||||
-DQT_FEATURE_xcb_xlib=OFF \
|
||||
-DQT_FEATURE_xkbcommon_x11=ON \
|
||||
-DQT_FEATURE_wayland_client=ON \
|
||||
-DQT_FEATURE_opengl=ON \
|
||||
-DQT_FEATURE_opengl_desktop=ON \
|
||||
-DQT_FEATURE_opengl_dynamic=OFF \
|
||||
|
||||
@@ -61,14 +61,10 @@ RUN dnf -y update && \
|
||||
eigen3-devel \
|
||||
zlib-static \
|
||||
fontconfig-devel \
|
||||
openblas-devel \
|
||||
openblas-static \
|
||||
openblas-serial \
|
||||
mesa-dri-drivers \
|
||||
libdrm-devel \
|
||||
libglvnd-core-devel \
|
||||
libglvnd-devel \
|
||||
wayland-devel \
|
||||
freetype-devel && \
|
||||
dnf clean all && rm -rf /var/cache/dnf
|
||||
|
||||
@@ -173,7 +169,6 @@ RUN set -eux; \
|
||||
-DQT_FEATURE_xcb=ON \
|
||||
-DQT_FEATURE_xcb_xlib=OFF \
|
||||
-DQT_FEATURE_xkbcommon_x11=ON \
|
||||
-DQT_FEATURE_wayland_client=ON \
|
||||
-DQT_FEATURE_opengl=ON \
|
||||
-DQT_FEATURE_opengl_desktop=ON \
|
||||
-DQT_FEATURE_opengl_dynamic=OFF \
|
||||
|
||||
@@ -71,14 +71,12 @@ RUN set -eux; \
|
||||
zlib1g-dev \
|
||||
libglib2.0-dev \
|
||||
libfontconfig1-dev \
|
||||
libopenblas-dev \
|
||||
libfftw3-dev \
|
||||
libeigen3-dev \
|
||||
libdrm-dev \
|
||||
mesa-utils \
|
||||
libassimp-dev \
|
||||
libglvnd-dev \
|
||||
libwayland-dev \
|
||||
libfreetype6-dev; \
|
||||
apt-get -y install gcc-12 g++-12; \
|
||||
apt-get clean; \
|
||||
|
||||
@@ -65,14 +65,11 @@ RUN set -eux; \
|
||||
zlib1g-dev \
|
||||
libglib2.0-dev \
|
||||
libfontconfig1-dev \
|
||||
libopenblas-dev \
|
||||
libfftw3-dev \
|
||||
libwayland-dev \
|
||||
qt6-base-dev \
|
||||
qt6-charts-dev \
|
||||
qt6-tools-dev \
|
||||
qt6-3d-dev \
|
||||
qt6-wayland-dev \
|
||||
libeigen3-dev \
|
||||
libfreetype6-dev; \
|
||||
apt-get clean; \
|
||||
|
||||
@@ -69,4 +69,4 @@ INSTALL(
|
||||
COMPONENT viewer
|
||||
)
|
||||
|
||||
qt_import_plugins(jfjoch_viewer INCLUDE Qt::QLibInputPlugin Qt::QXcbIntegrationPlugin Qt::QWaylandIntegrationPlugin)
|
||||
qt_import_plugins(jfjoch_viewer INCLUDE Qt::QXcbIntegrationPlugin)
|
||||
|
||||
Reference in New Issue
Block a user