gplugin/builders

Update all the things

2021-09-02, Gary Kramlich
be72d9b6e397
Parents fe339a70a0bc
Children 6fb88d645c86
Update all the things
30 files changed, 148 insertions(+), 277 deletions(-)
  • +7 -12
    Dockerfile.alpine-edge-amd64
  • +1 -3
    Dockerfile.clang-format
  • +26 -0
    Dockerfile.debian-bookworm-amd64
  • +4 -7
    Dockerfile.debian-bullseye-amd64
  • +3 -4
    Dockerfile.debian-bullseye-arm64
  • +3 -4
    Dockerfile.debian-bullseye-armhf
  • +1 -3
    Dockerfile.dist
  • +0 -24
    Dockerfile.fedora-31-amd64
  • +0 -24
    Dockerfile.fedora-32-amd64
  • +0 -24
    Dockerfile.fedora-33-amd64
  • +21 -0
    Dockerfile.fedora-34-amd64
  • +6 -9
    Dockerfile.fedora-rawhide-amd64
  • +0 -2
    Dockerfile.i18n
  • +1 -4
    Dockerfile.mingw-w64-i686
  • +1 -4
    Dockerfile.mingw-w64-x86_64
  • +5 -5
    Dockerfile.opensuse-tumbleweed-amd64
  • +0 -2
    Dockerfile.pvs-studio
  • +0 -2
    Dockerfile.scanbuild
  • +1 -3
    Dockerfile.simple
  • +0 -39
    Dockerfile.ubuntu-focal-amd64
  • +0 -39
    Dockerfile.ubuntu-groovy-amd64
  • +36 -0
    Dockerfile.ubuntu-hirsute-amd64
  • +1 -3
    Dockerfile.valgrind
  • +0 -29
    alpine/build.sh
  • +14 -13
    convey.yml
  • +1 -1
    debian/build.sh
  • +3 -3
    dist/build.sh
  • +10 -0
    meson/build.sh
  • +3 -5
    rpm/build.sh
  • +0 -9
    simple/build.sh
    • --- a/Dockerfile.alpine-edge-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.alpine-edge-amd64 Thu Sep 02 23:14:37 2021 -0500
    @@ -1,25 +1,20 @@
    FROM alpine:edge
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    -RUN set -ex && \
    - echo http://dl-cdn.alpinelinux.org/alpine/edge/testing | tee -a /etc/apk/repositories
    -
    RUN set -ex && \
    apk add --no-cache \
    - mercurial ca-certificates \
    + mercurial git ca-certificates \
    meson ninja gcc libc-dev help2man libxslt \
    gobject-introspection-dev gobject-introspection-dev gtk+3.0-dev \
    - gtk-doc \
    python3 python3-dev py-gobject3-dev py3-gobject3 \
    + py3-pip py3-jinja2 py3-markdown py3-pygments py3-toml \
    lua5.1-dev lua5.1-lgi \
    vala \
    - perl-glib
    + perl-glib && \
    + pip install -U typogrify
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=alpine \
    - VERSION=edge \
    - ARCH=amd64
    +COPY meson/build.sh /build.sh
    -COPY alpine/build.sh /build.sh
    +ENV MESON_OPTIONS="-Dperl5=false"
    +
    --- a/Dockerfile.clang-format Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.clang-format Thu Sep 02 23:14:37 2021 -0500
    @@ -1,6 +1,4 @@
    -FROM gplugin/builders:debian-bullseye-amd64
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +FROM gplugin/builders:debian-bookworm-amd64
    RUN set -ex && \
    apt-get update && \
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.debian-bookworm-amd64 Thu Sep 02 23:14:37 2021 -0500
    @@ -0,0 +1,26 @@
    +FROM debian:bookworm
    +
    +RUN set -ex && \
    + apt-get update && \
    + apt-get install -y --no-install-recommends \
    + ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    + build-essential meson gettext help2man xsltproc mercurial git \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-3-dev \
    + python3-dev python-gi-dev python3-gi \
    + python3-jinja2 python3-pygments python3-toml python3-typogrify \
    + liblua5.3-dev lua-lgi luarocks \
    + libtcc-dev \
    + valac \
    + libgjs-dev \
    + libperl-dev libglib-perl libglib-object-introspection-perl \
    + && \
    + apt-get clean && \
    + rm -rf /var/lib/apt/lists
    +
    +CMD ["/build.sh"]
    +
    +ENV TARGET=debian-bookworm-amd64
    +
    +COPY debian/build.sh /build.sh
    +
    --- a/Dockerfile.debian-bullseye-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.debian-bullseye-amd64 Thu Sep 02 23:14:37 2021 -0500
    @@ -1,15 +1,14 @@
    FROM debian:bullseye
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    RUN set -ex && \
    apt-get update && \
    apt-get install -y --no-install-recommends \
    ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial \
    + build-essential meson gettext help2man xsltproc mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - gtk-doc-tools libgtk-3-dev \
    + libgtk-3-dev \
    python3-dev python-gi-dev python3-gi \
    + python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    libtcc-dev \
    valac \
    @@ -21,9 +20,7 @@
    CMD ["/build.sh"]
    -ENV DISTRO=debian \
    - VERSION=bullseye \
    - ARCH=amd64
    +ENV TARGET=debian-bullseye-amd64
    COPY debian/build.sh /build.sh
    --- a/Dockerfile.debian-bullseye-arm64 Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.debian-bullseye-arm64 Thu Sep 02 23:14:37 2021 -0500
    @@ -1,15 +1,14 @@
    FROM arm64v8/debian:bullseye-slim
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    RUN set -ex && \
    apt-get update && \
    apt-get install -y --no-install-recommends \
    ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial \
    + build-essential meson gettext help2man xsltproc mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - gtk-doc-tools libgtk-3-dev \
    + libgtk-3-dev \
    python3-dev python-gi-dev python3-gi \
    + python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    libtcc-dev \
    valac \
    --- a/Dockerfile.debian-bullseye-armhf Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.debian-bullseye-armhf Thu Sep 02 23:14:37 2021 -0500
    @@ -1,15 +1,14 @@
    FROM arm32v7/debian:bullseye-slim
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    RUN set -ex && \
    apt-get update && \
    apt-get install -y --no-install-recommends \
    ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial \
    + build-essential meson gettext help2man xsltproc mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - gtk-doc-tools libgtk-3-dev \
    + libgtk-3-dev \
    python3-dev python-gi-dev python3-gi \
    + python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    libtcc-dev \
    valac \
    --- a/Dockerfile.dist Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.dist Thu Sep 02 23:14:37 2021 -0500
    @@ -1,6 +1,4 @@
    -FROM gplugin/builders:debian-bullseye-amd64
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +FROM gplugin/builders:debian-bookworm-amd64
    COPY dist/build.sh /
    --- a/Dockerfile.fedora-31-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,24 +0,0 @@
    -FROM fedora:31
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    -RUN set -ex && \
    - dnf install -y \
    - meson ninja-build gcc mercurial \
    - redhat-rpm-config rpm-build \
    - help2man libxslt gettext \
    - glib2-devel gobject-introspection-devel \
    - gtk3-devel gtk-doc \
    - lua-devel lua-lgi lua-lpeg \
    - python3-devel pygobject3-devel python3-gobject \
    - vala \
    - gjs-devel \
    - perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    -
    -CMD ["/build.sh"]
    -
    -ENV DISTRIBUTION=fedora \
    - VERSION=31 \
    - ARCH=amd64
    -
    -COPY rpm/build.sh /build.sh
    --- a/Dockerfile.fedora-32-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,24 +0,0 @@
    -FROM fedora:32
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    -RUN set -ex && \
    - dnf install -y \
    - meson ninja-build gcc mercurial \
    - redhat-rpm-config rpm-build \
    - help2man libxslt gettext \
    - glib2-devel gobject-introspection-devel \
    - gtk3-devel gtk-doc \
    - lua-devel lua-lgi lua-lpeg \
    - python3-devel pygobject3-devel python3-gobject \
    - vala \
    - gjs-devel \
    - perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    -
    -CMD ["/build.sh"]
    -
    -ENV DISTRIBUTION=fedora \
    - VERSION=32 \
    - ARCH=amd64
    -
    -COPY rpm/build.sh /build.sh
    --- a/Dockerfile.fedora-33-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,24 +0,0 @@
    -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 libxslt gettext \
    - glib2-devel gobject-introspection-devel \
    - gtk3-devel gtk-doc \
    - lua-devel lua-lgi lua-lpeg \
    - python3-devel pygobject3-devel python3-gobject \
    - vala \
    - gjs-devel \
    - perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    -
    -CMD ["/build.sh"]
    -
    -ENV DISTRIBUTION=fedora \
    - VERSION=33 \
    - ARCH=amd64
    -
    -COPY rpm/build.sh /build.sh
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-34-amd64 Thu Sep 02 23:14:37 2021 -0500
    @@ -0,0 +1,21 @@
    +FROM fedora:34
    +
    +RUN set -ex && \
    + dnf install -y \
    + meson ninja-build gcc mercurial git \
    + redhat-rpm-config rpm-build \
    + help2man libxslt gettext \
    + glib2-devel gobject-introspection-devel \
    + gtk3-devel \
    + lua-devel lua-lgi lua-lpeg \
    + python3-devel pygobject3-devel python3-gobject \
    + python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    + vala \
    + gjs-devel \
    + perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    +
    +CMD ["/build.sh"]
    +
    +ENV TARGET=fedora-34-amd64
    +
    +COPY rpm/build.sh /build.sh
    --- a/Dockerfile.fedora-rawhide-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.fedora-rawhide-amd64 Thu Sep 02 23:14:37 2021 -0500
    @@ -1,25 +1,22 @@
    -#FROM fedora:rawhide
    -FROM registry.fedoraproject.org/fedora:rawhide
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +FROM fedora:rawhide
    RUN set -ex && \
    + dnf update -y && \
    dnf install -y \
    - meson ninja-build gcc mercurial \
    + meson ninja-build gcc mercurial git \
    redhat-rpm-config rpm-build \
    help2man libxslt gettext \
    glib2-devel gobject-introspection-devel \
    - gtk3-devel gtk-doc \
    + gtk3-devel \
    lua-devel lua-lgi lua-lpeg \
    python3-devel pygobject3-devel python3-gobject \
    + python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    vala \
    gjs-devel \
    perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=fedora \
    - VERSION=rawhide \
    - ARCH=amd64
    +ENV TARGET=fedora-rawhide-amd64
    COPY rpm/build.sh /build.sh
    --- a/Dockerfile.i18n Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.i18n Thu Sep 02 23:14:37 2021 -0500
    @@ -1,6 +1,4 @@
    FROM gplugin/builders:debian-bullseye-amd64
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    COPY i18n/build.sh /
    --- a/Dockerfile.mingw-w64-i686 Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.mingw-w64-i686 Thu Sep 02 23:14:37 2021 -0500
    @@ -1,8 +1,5 @@
    -# vi:et:ts=4 sw=4 sts=4:ft=dockerfile
    FROM rwgrim/msys2-cross
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    # setup the host os
    RUN set -ex && \
    dpkg --add-architecture i386 && \
    @@ -10,7 +7,7 @@
    apt-get install -y --no-install-recommends -o APT::Immediate-Configure=false \
    ca-certificates build-essential gettext xz-utils pkg-config zip \
    mingw-w64 mingw-w64-i686-dev mingw-w64-tools \
    - mercurial meson ninja-build help2man \
    + mercurial git meson ninja-build help2man \
    wine wine32 xauth xvfb \
    libglib2.0-dev gobject-introspection \
    valac \
    --- a/Dockerfile.mingw-w64-x86_64 Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.mingw-w64-x86_64 Thu Sep 02 23:14:37 2021 -0500
    @@ -1,15 +1,12 @@
    -# vi:et:ts=4 sw=4 sts=4:ft=dockerfile
    FROM rwgrim/msys2-cross
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    # setup the host os
    RUN set -ex && \
    apt-get update && \
    apt-get install -y --no-install-recommends \
    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 \
    + mercurial git meson ninja-build help2man \
    wine wine64 xauth xvfb \
    libglib2.0-dev gobject-introspection \
    valac \
    --- a/Dockerfile.opensuse-tumbleweed-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.opensuse-tumbleweed-amd64 Thu Sep 02 23:14:37 2021 -0500
    @@ -1,18 +1,18 @@
    FROM opensuse/tumbleweed:latest
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    RUN set -ex && \
    zypper --gpg-auto-import-keys refresh && \
    zypper -n install \
    ca-certificates-mozilla \
    - meson ninja gcc mercurial \
    + meson ninja gcc mercurial git \
    rpm-build \
    help2man libxslt-tools gettext-tools \
    glib2-devel gobject-introspection-devel \
    - gtk3-devel gtk-doc \
    + gtk3-devel \
    python3-devel python3-gobject python3-gobject-devel \
    - lua53-devel lua53-lgi \
    + python3-Jinja2 python3-Markdown python3-MarkupSafe python3-Pygments \
    + python3-toml python3-typogrify \
    + lua51-devel lua-lgi \
    vala \
    libgjs-devel \
    perl-ExtUtils-Config perl-Glib perl-Glib-Object-Introspection \
    --- a/Dockerfile.pvs-studio Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.pvs-studio Thu Sep 02 23:14:37 2021 -0500
    @@ -2,8 +2,6 @@
    ENV PVS_STUDIO_DOWNLOAD_URL=https://files.viva64.com/pvs-studio-latest.tgz
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    RUN set -ex && \
    apt-get update && \
    apt-get install -y --no-install-recommends wget strace && \
    --- a/Dockerfile.scanbuild Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.scanbuild Thu Sep 02 23:14:37 2021 -0500
    @@ -1,7 +1,5 @@
    FROM gplugin/builders:debian-bullseye-amd64
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    RUN set -ex && \
    apt-get update && \
    apt-get install -y --no-install-recommends clang-tools && \
    --- a/Dockerfile.simple Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.simple Thu Sep 02 23:14:37 2021 -0500
    @@ -1,6 +1,4 @@
    FROM gplugin/builders:debian-bullseye-amd64
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +COPY meson/build.sh /
    -COPY simple/build.sh /
    -
    --- a/Dockerfile.ubuntu-focal-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,39 +0,0 @@
    -FROM ubuntu:focal
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    -COPY ubuntu/tzdata.selections /
    -
    -RUN set -ex && \
    - debconf-set-selections -v /tzdata.selections && \
    - ln -nsf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends tzdata && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - gtk-doc-tools libgtk-3-dev \
    - python3-dev python-gi-dev python3-gi \
    - liblua5.3-dev lua-lgi luarocks \
    - libtcc-dev \
    - valac \
    - libgjs-dev \
    - libperl-dev libglib-perl libglib-object-introspection-perl \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -CMD ["/build.sh"]
    -
    -ENV DISTRO=debian \
    - VERSION=bullseye \
    - ARCH=amd64
    -
    -COPY debian/build.sh /build.sh
    -
    --- a/Dockerfile.ubuntu-groovy-amd64 Tue Oct 06 20:22:01 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,39 +0,0 @@
    -FROM ubuntu:groovy
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    -COPY ubuntu/tzdata.selections /
    -
    -RUN set -ex && \
    - debconf-set-selections -v /tzdata.selections && \
    - ln -nsf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends tzdata && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - gtk-doc-tools libgtk-3-dev \
    - python3-dev python-gi-dev python3-gi \
    - liblua5.3-dev lua-lgi luarocks \
    - libtcc-dev \
    - valac \
    - libgjs-dev \
    - libperl-dev libglib-perl libglib-object-introspection-perl \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -CMD ["/build.sh"]
    -
    -ENV DISTRO=debian \
    - VERSION=bullseye \
    - ARCH=amd64
    -
    -COPY debian/build.sh /build.sh
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.ubuntu-hirsute-amd64 Thu Sep 02 23:14:37 2021 -0500
    @@ -0,0 +1,36 @@
    +FROM ubuntu:hirsute
    +
    +COPY ubuntu/tzdata.selections /
    +
    +RUN set -ex && \
    + debconf-set-selections -v /tzdata.selections && \
    + ln -nsf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
    + apt-get update && \
    + apt-get install -y --no-install-recommends tzdata && \
    + apt-get clean && \
    + rm -rf /var/lib/apt/lists
    +
    +RUN set -ex && \
    + apt-get update && \
    + apt-get install -y --no-install-recommends \
    + ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    + build-essential meson gettext help2man xsltproc mercurial git \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-3-dev \
    + python3-dev python-gi-dev python3-gi \
    + python3-jinja2 python3-pygments python3-toml python3-typogrify \
    + liblua5.3-dev lua-lgi luarocks \
    + libtcc-dev \
    + valac \
    + libgjs-dev \
    + libperl-dev libglib-perl libglib-object-introspection-perl \
    + && \
    + apt-get clean && \
    + rm -rf /var/lib/apt/lists
    +
    +CMD ["/build.sh"]
    +
    +ENV TARGET=ubuntu-hirsute-amd64
    +
    +COPY debian/build.sh /build.sh
    +
    --- a/Dockerfile.valgrind Tue Oct 06 20:22:01 2020 -0500
    +++ b/Dockerfile.valgrind Thu Sep 02 23:14:37 2021 -0500
    @@ -1,6 +1,4 @@
    -FROM gplugin/builders:fedora-32-amd64
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +FROM gplugin/builders:fedora-34-amd64
    RUN set -ex && \
    dnf install -y valgrind dnf-plugins-core && \
    --- a/alpine/build.sh Tue Oct 06 20:22:01 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,29 +0,0 @@
    -#!/bin/sh -ex
    -# Copyright (C) 2015-2016 Gary Kramlich <grim@reaperworld.com>
    -#
    -# This program is free software; you can redistribute it and/or modify
    -# it under the terms of the GNU General Public License as published by
    -# the Free Software Foundation; either version 3 of the License, or
    -# (at your option) any later version.
    -#
    -# This program is distributed in the hope that it will be useful,
    -# but WITHOUT ANY WARRANTY; without even the implied warranty of
    -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    -# GNU General Public License for more details.
    -#
    -# You should have received a copy of the GNU General Public License
    -# along with this program; if not, write to the Free Software Foundation,
    -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    -
    -cd ${CONVEY_WORKSPACE}
    -
    -BUILD_TRIPLET=${DISTRIBUTION}-${VERSION}-${ARCH}
    -
    -ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${BUILD_TRIPLET}
    -mkdir -p ${ARTIFACTS_DIR}
    -
    -BUILD_DIR="build-${BUILD_TRIPLET}"
    -
    -meson -Dperl5=False ${BUILD_DIR}
    -ninja -C ${BUILD_DIR}
    -ninja -C ${BUILD_DIR} test
    --- a/convey.yml Tue Oct 06 20:22:01 2020 -0500
    +++ b/convey.yml Thu Sep 02 23:14:37 2021 -0500
    @@ -55,7 +55,8 @@
    run: always
    alpine-edge-amd64:
    - environment: [TARGET=alpine-edge-amd64]
    + environment:
    + - TARGET=alpine-edge-amd64
    stages:
    - tasks: [import, build]
    @@ -79,23 +80,18 @@
    stages:
    - tasks: [import, build]
    + debian-bookworm-amd64:
    + environment: TARGET=debian-bookworm-amd64
    + stages:
    + - tasks: [import, build]
    +
    dist:
    environment: [TARGET=dist]
    stages:
    - tasks: [import, build]
    - fedora-31-amd64:
    - environment: [TARGET=fedora-31-amd64]
    - stages:
    - - tasks: [import, build]
    -
    - fedora-32-amd64:
    - environment: [TARGET=fedora-32-amd64]
    - stages:
    - - tasks: [import, build]
    -
    - fedora-33-amd64:
    - environment: [TARGET=fedora-33-amd64]
    + fedora-34-amd64:
    + environment: [TARGET=fedora-34-amd64]
    stages:
    - tasks: [import, build]
    @@ -149,6 +145,11 @@
    stages:
    - tasks: [import, build]
    + ubuntu-hirsute-amd64:
    + environment: [TARGET=ubuntu-hirsute-amd64]
    + stages:
    + - tasks: [import, build]
    +
    valgrind:
    environment: [TARGET=valgrind]
    stages:
    --- a/debian/build.sh Tue Oct 06 20:22:01 2020 -0500
    +++ b/debian/build.sh Thu Sep 02 23:14:37 2021 -0500
    @@ -17,7 +17,7 @@
    cd "${CONVEY_WORKSPACE}"
    -export ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${DISTRO}-${VERSION}-${ARCH}
    +export ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${TARGET}
    mkdir -p "${ARTIFACTS_DIR}"
    cp -a "${CONVEY_WORKSPACE}"/packaging/debian debian
    --- a/dist/build.sh Tue Oct 06 20:22:01 2020 -0500
    +++ b/dist/build.sh Thu Sep 02 23:14:37 2021 -0500
    @@ -17,10 +17,10 @@
    cd ${CONVEY_WORKSPACE}
    -BUILD_DIR="build-dist"
    +BUILD_DIR="${TARGET:-_build}"
    -meson ${BUILD_DIR}
    -ninja -C ${BUILD_DIR} dist
    +meson "${BUILD_DIR}"
    +meson dist -C "${BUILD_DIR}"
    EC=${?}
    cp -a ${BUILD_DIR}/meson-dist ${CONVEY_WORKSPACE}/dist
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/meson/build.sh Thu Sep 02 23:14:37 2021 -0500
    @@ -0,0 +1,10 @@
    +#!/bin/sh -ex
    +
    +cd ${CONVEY_WORKSPACE}
    +
    +BUILD_DIR=${TARGET:-_build}
    +
    +meson ${MESON_OPTIONS} "${BUILD_DIR}"
    +meson compile -C "${BUILD_DIR}"
    +meson test -C "${BUILD_DIR}"
    +
    --- a/rpm/build.sh Tue Oct 06 20:22:01 2020 -0500
    +++ b/rpm/build.sh Thu Sep 02 23:14:37 2021 -0500
    @@ -17,20 +17,18 @@
    cd ${CONVEY_WORKSPACE}
    -BUILD_TRIPLET=${DISTRIBUTION}-${VERSION}-${ARCH}
    -
    -ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${BUILD_TRIPLET}
    +ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${TARGET}
    mkdir -p ${ARTIFACTS_DIR}
    BUILD_NUMBER="${BUILD_NUMBER:-0}"
    BUILD_VERSION="${BUILD_NUMBER}~$(hg id -i)"
    # we need to generate the spec file so we need to run a meson
    -meson /tmp/${BUILD_TRIPLET}
    +meson /tmp/${TARGET}
    # now that we have our rpm spec file we can do an rpmbuild
    rpmbuild -bb \
    -D "_rpmdir ${ARTIFACTS_DIR}" \
    -D "_builddir ${CONVEY_WORKSPACE}" \
    -D "build_number ${BUILD_VERSION}" \
    - /tmp/${BUILD_TRIPLET}/packaging/gplugin.spec
    + /tmp/${TARGET}/packaging/gplugin.spec
    --- a/simple/build.sh Tue Oct 06 20:22:01 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,9 +0,0 @@
    -#!/bin/sh -ex
    -
    -cd ${CONVEY_WORKSPACE}
    -
    -BUILD_DIR="build-simple"
    -
    -meson "${BUILD_DIR}"
    -ninja -C "${BUILD_DIR}" test
    -