talkatu/builders

I'm in the process of updating the tests to use broadway instead of xvfb so all the builders need broadway and to remove xvfb

2020-09-05, Gary Kramlich
291ade1a05aa
Parents 34ab3a229c27
Children 21ecf6d2bda1
I'm in the process of updating the tests to use broadway instead of xvfb so all the builders need broadway and to remove xvfb
14 files changed, 49 insertions(+), 17 deletions(-)
  • +3 -2
    Dockerfile.debian-bullseye-amd64
  • +3 -2
    Dockerfile.debian-buster-amd64
  • +3 -2
    Dockerfile.debian-buster-arm64
  • +3 -2
    Dockerfile.debian-buster-armhf
  • +3 -2
    Dockerfile.debian-buster-i386
  • +1 -1
    Dockerfile.fedora-31-amd64
  • +1 -1
    Dockerfile.fedora-32-amd64
  • +22 -0
    Dockerfile.fedora-33-amd64
  • +1 -1
    Dockerfile.fedora-rawhide-amd64
  • +1 -1
    Dockerfile.mingw-w64-i686
  • +1 -1
    Dockerfile.mingw-w64-x86_64
  • +1 -1
    Dockerfile.pvs-studio
  • +5 -0
    convey.yml
  • +1 -1
    mingw/build.sh
    • --- a/Dockerfile.debian-bullseye-amd64 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.debian-bullseye-amd64 Sat Sep 05 21:55:04 2020 -0500
    @@ -6,9 +6,10 @@
    RUN set -ex && \
    apt-get update && \
    apt-get install -y --no-install-recommends \
    - devscripts fakeroot debhelper libdistro-info-perl xvfb xauth \
    + devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man mercurial libxml2-utils \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev gtk-doc-tools \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-3-dev libgtk-3-bin gtk-doc-tools \
    libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
    valac \
    && \
    --- a/Dockerfile.debian-buster-amd64 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.debian-buster-amd64 Sat Sep 05 21:55:04 2020 -0500
    @@ -7,9 +7,10 @@
    echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list && \
    apt-get update && \
    apt-get install -y --no-install-recommends -t buster-backports \
    - devscripts fakeroot debhelper libdistro-info-perl xvfb xauth \
    + devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man mercurial libxml2-utils \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev gtk-doc-tools \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev
    + libgtk-3-dev libgtk-3-bin gtk-doc-tools \
    libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
    valac \
    && \
    --- a/Dockerfile.debian-buster-arm64 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.debian-buster-arm64 Sat Sep 05 21:55:04 2020 -0500
    @@ -7,9 +7,10 @@
    echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list && \
    apt-get update && \
    apt-get install -y --no-install-recommends -t buster-backports \
    - devscripts fakeroot debhelper libdistro-info-perl xvfb xauth \
    + devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man mercurial libxml2-utils \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev gtk-doc-tools \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-3-dev libgtk-3-bin gtk-doc-tools \
    libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
    valac \
    && \
    --- a/Dockerfile.debian-buster-armhf Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.debian-buster-armhf Sat Sep 05 21:55:04 2020 -0500
    @@ -7,9 +7,10 @@
    echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list && \
    apt-get update && \
    apt-get install -y --no-install-recommends -t buster-backports \
    - devscripts fakeroot debhelper libdistro-info-perl xvfb xauth \
    + devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man mercurial libxml2-utils \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev gtk-doc-tools \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-3-dev libgtk-3-bin gtk-doc-tools \
    libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
    valac \
    && \
    --- a/Dockerfile.debian-buster-i386 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.debian-buster-i386 Sat Sep 05 21:55:04 2020 -0500
    @@ -7,9 +7,10 @@
    echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list && \
    apt-get update && \
    apt-get install -y --no-install-recommends -t buster-backports \
    - devscripts fakeroot debhelper libdistro-info-perl xvfb xauth \
    + devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man mercurial libxml2-utils \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev gtk-doc-tools \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-3-dev libgtk-3-bin gtk-doc-tools \
    libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
    valac \
    && \
    --- a/Dockerfile.fedora-31-amd64 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.fedora-31-amd64 Sat Sep 05 21:55:04 2020 -0500
    @@ -5,7 +5,7 @@
    RUN set -ex && \
    dnf install -y \
    - meson ninja-build gcc mercurial xorg-x11-server-Xvfb \
    + meson ninja-build gcc mercurial \
    redhat-rpm-config rpm-build \
    help2man gettext \
    glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
    --- a/Dockerfile.fedora-32-amd64 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.fedora-32-amd64 Sat Sep 05 21:55:04 2020 -0500
    @@ -5,7 +5,7 @@
    RUN set -ex && \
    dnf install -y \
    - meson ninja-build gcc mercurial xorg-x11-server-Xvfb \
    + meson ninja-build gcc mercurial \
    redhat-rpm-config rpm-build \
    help2man gettext \
    glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-33-amd64 Sat Sep 05 21:55:04 2020 -0500
    @@ -0,0 +1,22 @@
    +# vi:et:ft=dockerfile
    +FROM fedora:33
    +
    +MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +
    +RUN set -ex && \
    + dnf install -y \
    + meson ninja-build gcc mercurial \
    + redhat-rpm-config rpm-build \
    + help2man gettext \
    + glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
    + cmark-devel gspell-devel gumbo-parser-devel glade-devel \
    + vala
    +
    +CMD ["/build.sh"]
    +
    +ENV DISTRIBUTION=fedora \
    + VERSION=33 \
    + ARCH=amd64
    +
    +COPY rpm/build.sh /build.sh
    +
    --- a/Dockerfile.fedora-rawhide-amd64 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.fedora-rawhide-amd64 Sat Sep 05 21:55:04 2020 -0500
    @@ -5,7 +5,7 @@
    RUN set -ex && \
    dnf install -y \
    - meson ninja-build gcc mercurial xorg-x11-server-Xvfb \
    + meson ninja-build gcc mercurial \
    redhat-rpm-config rpm-build \
    help2man gettext \
    glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
    --- a/Dockerfile.mingw-w64-i686 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.mingw-w64-i686 Sat Sep 05 21:55:04 2020 -0500
    @@ -11,7 +11,7 @@
    ca-certificates build-essential gettext xz-utils pkg-config zip \
    mingw-w64 mingw-w64-i686-dev mingw-w64-tools \
    mercurial meson ninja-build help2man \
    - wine wine32 xauth xvfb \
    + wine wine32 \
    libglib2.0-dev gobject-introspection \
    && \
    apt-get clean && \
    --- a/Dockerfile.mingw-w64-x86_64 Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.mingw-w64-x86_64 Sat Sep 05 21:55:04 2020 -0500
    @@ -10,7 +10,7 @@
    ca-certificates build-essential gettext xz-utils pkg-config zip \
    mingw-w64 mingw-w64-x86-64-dev mingw-w64-tools \
    mercurial meson ninja-build help2man \
    - wine wine64 xauth xvfb \
    + wine wine64 \
    libglib2.0-dev gobject-introspection \
    && \
    apt-get clean && \
    --- a/Dockerfile.pvs-studio Sat Aug 22 20:33:41 2020 -0500
    +++ b/Dockerfile.pvs-studio Sat Sep 05 21:55:04 2020 -0500
    @@ -1,6 +1,6 @@
    FROM talkatu/builders:debian-bullseye-amd64
    -ENV PVS_STUDIO_DOWNLOAD_URL=https://files.viva64.com/pvs-studio-7.08.39765.52-x86_64.tgz
    +ENV PVS_STUDIO_DOWNLOAD_URL=https://files.viva64.com/pvs-studio-7.09.41421.64-x86_64.tgz
    MAINTAINER Gary Kramlich <grim@reaperworld.com>
    --- a/convey.yml Sat Aug 22 20:33:41 2020 -0500
    +++ b/convey.yml Sat Sep 05 21:55:04 2020 -0500
    @@ -73,6 +73,11 @@
    stages:
    - tasks: [import, build]
    + fedora-33-amd64:
    + environment: TARGET=fedora-33-amd64
    + stages:
    + - tasks: [import, build]
    +
    fedora-rawhide-amd64:
    environment: TARGET=fedora-rawhide-amd64
    stages:
    --- a/mingw/build.sh Sat Aug 22 20:33:41 2020 -0500
    +++ b/mingw/build.sh Sat Sep 05 21:55:04 2020 -0500
    @@ -23,7 +23,7 @@
    cp "${CONVEY_WORKSPACE}/packaging/${PKGBUILD_DIR}/PKGBUILD" .
    -MINGW_PACKAGE_PREFIX="${MINGW_DISTRO}" xvfb-run makepkg-cross "${MAKEPKG_ARGS}"
    +MINGW_PACKAGE_PREFIX="${MINGW_DISTRO}" makepkg-cross "${MAKEPKG_ARGS}"
    mv *.tar.xz "${CONVEY_WORKSPACE}/${MINGW_DISTRO}"