ci: Remove QtWebKit testing
It's broken in weird ways since recently (`:version` not loading, segfault in test_version.py). Since nobody should be using it anyways, there is no point in spending time on debugging a tricky issue. Next step is probably ripping it out completely, but that's a separate can of worms. See #4039
This commit is contained in:
parent
ae758ad85c
commit
c95a46666a
|
|
@ -91,8 +91,6 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- testenv: py-qt5
|
||||
image: archlinux-webkit
|
||||
- testenv: py-qt5
|
||||
image: archlinux-webengine
|
||||
- testenv: py-qt5
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
image:
|
||||
- archlinux-webkit
|
||||
- archlinux-webengine
|
||||
- archlinux-webengine-unstable
|
||||
- archlinux-webengine-unstable-qt6
|
||||
|
|
|
|||
|
|
@ -7,28 +7,23 @@ RUN sed -i '/^# after the header/a[kde-unstable]\nInclude = /etc/pacman.d/mirror
|
|||
RUN pacman -Sy --noconfirm archlinux-keyring
|
||||
RUN pacman -Su --noconfirm \
|
||||
git \
|
||||
{% if webengine %}
|
||||
python-tox \
|
||||
python-distlib \
|
||||
libxml2-legacy \
|
||||
{% endif %}
|
||||
{% if qt6 %}
|
||||
qt6-base \
|
||||
qt6-declarative \
|
||||
{% if webengine %}
|
||||
qt6-webengine python-pyqt6-webengine \
|
||||
pdfjs \
|
||||
{% else %}{{ 1/0 }}{% endif %}
|
||||
qt6-webengine \
|
||||
python-pyqt6-webengine \
|
||||
pdfjs \
|
||||
python-pyqt6 \
|
||||
{% else %}
|
||||
qt5-base \
|
||||
qt5-declarative \
|
||||
openssl-1.1 \
|
||||
{% if webengine %}
|
||||
qt5-webengine \
|
||||
python-pyqtwebengine \
|
||||
python-pyqt5 \
|
||||
{% endif %}
|
||||
qt5-webengine \
|
||||
python-pyqtwebengine \
|
||||
python-pyqt5 \
|
||||
{% endif %}
|
||||
xorg-xinit \
|
||||
xorg-server-xvfb \
|
||||
|
|
@ -41,56 +36,17 @@ RUN useradd user -u 1001 && \
|
|||
mkdir /home/user && \
|
||||
chown user:users /home/user
|
||||
|
||||
{% if not webengine %}
|
||||
RUN pacman -U --noconfirm \
|
||||
https://archive.archlinux.org/packages/q/qt5-webkit/qt5-webkit-5.212.0alpha4-18-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/i/icu/icu-72.1-2-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/l/libxml2/libxml2-2.10.4-4-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/l/libxslt/libxslt-1.1.42-2-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/l/libarchive/libarchive-3.7.9-1-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/q/qt5-base/qt5-base-5.15.10%2Bkde%2Br129-3-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/q/qt5-declarative/qt5-declarative-5.15.10%2Bkde%2Br31-1-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/q/qt5-translations/qt5-translations-5.15.10-1-any.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/q/qt5-sensors/qt5-sensors-5.15.10-1-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/q/qt5-location/qt5-location-5.15.10%2Bkde%2Br5-1-x86_64.pkg.tar.zst \
|
||||
https://archive.archlinux.org/packages/q/qt5-webchannel/qt5-webchannel-5.15.10%2Bkde%2Br3-1-x86_64.pkg.tar.zst
|
||||
RUN pacman -S --noconfirm base-devel
|
||||
|
||||
RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers # needed for makepkg
|
||||
USER user
|
||||
RUN cd ~ && \
|
||||
git clone https://aur.archlinux.org/python310.git && \
|
||||
cd python310 && \
|
||||
makepkg -si --noconfirm
|
||||
USER root
|
||||
RUN python3.10 -m ensurepip
|
||||
RUN python3.10 -m pip install tox pyqt5-sip
|
||||
{% endif %}
|
||||
|
||||
{% if qt6 %}
|
||||
{% set pyqt_module = 'PyQt6' %}
|
||||
{% else %}
|
||||
{% set pyqt_module = 'PyQt5' %}
|
||||
{% endif %}
|
||||
{% if webengine %}
|
||||
{% set python = 'python3' %}
|
||||
RUN {{ python }} -c "from {{ pyqt_module }} import QtWebEngineCore, QtWebEngineWidgets"
|
||||
{% else %}
|
||||
{% set python = 'python3.10' %}
|
||||
RUN {{ python }} -c "from {{ pyqt_module }} import QtWebKit, QtWebKitWidgets"
|
||||
{% endif %}
|
||||
RUN python3 -c "from {{ pyqt_module }} import QtWebEngineCore, QtWebEngineWidgets"
|
||||
|
||||
USER user
|
||||
WORKDIR /home/user
|
||||
RUN git config --global --add safe.directory /outside/.git
|
||||
|
||||
{% if not webengine %}
|
||||
# Unknown May 2025 crashes with QtWebKit
|
||||
ENV QT_XCB_FORCE_SOFTWARE_OPENGL=1
|
||||
ENV QT_QUICK_BACKEND=software
|
||||
{% endif %}
|
||||
|
||||
CMD git clone /outside qutebrowser.git && \
|
||||
cd qutebrowser.git && \
|
||||
{{ python }} -m tox -e {% if qt6 %}py-qt6{% else %}py-qt5{% endif %}
|
||||
|
|
|
|||
|
|
@ -14,11 +14,10 @@ import jinja2
|
|||
|
||||
|
||||
CONFIGS = {
|
||||
'archlinux-webkit': {'webengine': False, 'unstable': False, 'qt6': False},
|
||||
'archlinux-webengine': {'webengine': True, 'unstable': False, 'qt6': False},
|
||||
'archlinux-webengine-qt6': {'webengine': True, 'unstable': False, 'qt6': True},
|
||||
'archlinux-webengine-unstable': {'webengine': True, 'unstable': True, 'qt6': False},
|
||||
'archlinux-webengine-unstable-qt6': {'webengine': True, 'unstable': True, 'qt6': True},
|
||||
'archlinux-webengine': {'unstable': False, 'qt6': False},
|
||||
'archlinux-webengine-qt6': {'unstable': False, 'qt6': True},
|
||||
'archlinux-webengine-unstable': {'unstable': True, 'qt6': False},
|
||||
'archlinux-webengine-unstable-qt6': {'unstable': True, 'qt6': True},
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue