ci: Drop Archlinux Qt 5 images/jobs
For now, Qt 5 is still tested via the Qt 5.15 PyPI wheels.
See https://github.com/qutebrowser/qutebrowser/issues/8417#issuecomment-3495979318
https://lists.archlinux.org/archives/list/arch-dev-public@lists.archlinux.org/thread/U45C4RAW4IXVLO376XGFNLEGGFFXCULV/
(cherry picked from commit 9316d428ef)
This commit is contained in:
parent
0c34bf2f79
commit
86ed433b97
|
|
@ -17,8 +17,6 @@ jobs:
|
|||
matrix:
|
||||
include:
|
||||
- testenv: bleeding
|
||||
image: "archlinux-webengine-unstable-qt6"
|
||||
- testenv: bleeding-qt5
|
||||
image: "archlinux-webengine-unstable"
|
||||
container:
|
||||
image: "qutebrowser/ci:${{ matrix.image }}"
|
||||
|
|
@ -40,7 +38,6 @@ jobs:
|
|||
run: "python scripts/dev/ci/problemmatchers.py py3 ${{ runner.temp }}"
|
||||
- name: Upgrade 3rd party assets
|
||||
run: "tox exec -e ${{ matrix.testenv }} -- python scripts/dev/update_3rdparty.py --gh-token ${{ secrets.GITHUB_TOKEN }} --modern-pdfjs"
|
||||
if: "endsWith(matrix.image, '-qt6')"
|
||||
- name: Run tox
|
||||
run: dbus-run-session tox -e ${{ matrix.testenv }}
|
||||
- name: Gather info
|
||||
|
|
|
|||
|
|
@ -90,14 +90,10 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- testenv: py-qt5
|
||||
- testenv: py
|
||||
image: archlinux-webengine
|
||||
- testenv: py-qt5
|
||||
- testenv: py
|
||||
image: archlinux-webengine-unstable
|
||||
- testenv: py
|
||||
image: archlinux-webengine-qt6
|
||||
- testenv: py
|
||||
image: archlinux-webengine-unstable-qt6
|
||||
container:
|
||||
image: "qutebrowser/ci:${{ matrix.image }}"
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@ jobs:
|
|||
image:
|
||||
- archlinux-webengine
|
||||
- archlinux-webengine-unstable
|
||||
- archlinux-webengine-unstable-qt6
|
||||
- archlinux-webengine-qt6
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-python@v6
|
||||
|
|
|
|||
|
|
@ -10,21 +10,12 @@ RUN pacman -Su --noconfirm \
|
|||
python-tox \
|
||||
python-distlib \
|
||||
libxml2-legacy \
|
||||
{% if qt6 %}
|
||||
qt6-base \
|
||||
qt6-declarative \
|
||||
qt6-webengine \
|
||||
python-pyqt6-webengine \
|
||||
pdfjs \
|
||||
python-pyqt6 \
|
||||
{% else %}
|
||||
qt5-base \
|
||||
qt5-declarative \
|
||||
openssl-1.1 \
|
||||
qt5-webengine \
|
||||
python-pyqtwebengine \
|
||||
python-pyqt5 \
|
||||
{% endif %}
|
||||
qt6-base \
|
||||
qt6-declarative \
|
||||
qt6-webengine \
|
||||
python-pyqt6-webengine \
|
||||
pdfjs \
|
||||
python-pyqt6 \
|
||||
xorg-xinit \
|
||||
xorg-server-xvfb \
|
||||
ttf-bitstream-vera \
|
||||
|
|
@ -36,12 +27,7 @@ RUN useradd user -u 1001 && \
|
|||
mkdir /home/user && \
|
||||
chown user:users /home/user
|
||||
|
||||
{% if qt6 %}
|
||||
{% set pyqt_module = 'PyQt6' %}
|
||||
{% else %}
|
||||
{% set pyqt_module = 'PyQt5' %}
|
||||
{% endif %}
|
||||
RUN python3 -c "from {{ pyqt_module }} import QtWebEngineCore, QtWebEngineWidgets"
|
||||
RUN python3 -c "from PyQt6 import QtWebEngineCore, QtWebEngineWidgets"
|
||||
|
||||
USER user
|
||||
WORKDIR /home/user
|
||||
|
|
@ -49,4 +35,4 @@ RUN git config --global --add safe.directory /outside/.git
|
|||
|
||||
CMD git clone /outside qutebrowser.git && \
|
||||
cd qutebrowser.git && \
|
||||
{{ python }} -m tox -e {% if qt6 %}py-qt6{% else %}py-qt5{% endif %}
|
||||
{{ python }} -m tox -e py-qt6
|
||||
|
|
|
|||
|
|
@ -7,17 +7,14 @@
|
|||
|
||||
"""Generate Dockerfiles for qutebrowser's CI."""
|
||||
|
||||
import sys
|
||||
import argparse
|
||||
|
||||
import jinja2
|
||||
|
||||
|
||||
CONFIGS = {
|
||||
'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},
|
||||
'archlinux-webengine': {'unstable': False},
|
||||
'archlinux-webengine-unstable': {'unstable': True},
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue