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