gplugin/builders

Add gtk4 to everything and remove debian bullseye as it doesn't have gtk4

2021-10-04, Gary Kramlich
059dd1afed06
Parents 767f33cebd00
Children f16a32a0f707
Add gtk4 to everything and remove debian bullseye as it doesn't have gtk4
20 files changed, 74 insertions(+), 281 deletions(-)
  • +2 -1
    Dockerfile.alpine-edge-amd64
  • +1 -1
    Dockerfile.debian-bookworm-amd64
  • +26 -0
    Dockerfile.debian-bookworm-arm64
  • +26 -0
    Dockerfile.debian-bookworm-armhf
  • +1 -1
    Dockerfile.debian-bullseye-amd64
  • +0 -28
    Dockerfile.debian-bullseye-arm64
  • +0 -28
    Dockerfile.debian-bullseye-armhf
  • +1 -1
    Dockerfile.fedora-34-amd64
  • +1 -1
    Dockerfile.fedora-rawhide-amd64
  • +1 -1
    Dockerfile.i18n
  • +0 -35
    Dockerfile.mingw-w64-i686
  • +0 -34
    Dockerfile.mingw-w64-x86_64
  • +6 -6
    Dockerfile.opensuse-tumbleweed-amd64
  • +0 -22
    Dockerfile.pvs-studio
  • +1 -1
    Dockerfile.simple
  • +1 -1
    Dockerfile.ubuntu-hirsute-amd64
  • +1 -1
    Dockerfile.valgrind
  • +6 -21
    convey.yml
  • +0 -29
    mingw/build.sh
  • +0 -69
    pvs-studio/build.sh
    • --- a/Dockerfile.alpine-edge-amd64 Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.alpine-edge-amd64 Mon Oct 04 00:46:58 2021 -0500
    @@ -4,7 +4,8 @@
    apk add --no-cache \
    mercurial git ca-certificates \
    meson ninja gcc libc-dev help2man libxslt \
    - gobject-introspection-dev gobject-introspection-dev gtk+3.0-dev \
    + gobject-introspection-dev gobject-introspection-dev \
    + gtk+3.0-dev gtk4.0-dev \
    python3 python3-dev py-gobject3-dev py3-gobject3 \
    py3-pip py3-jinja2 py3-markdown py3-pygments py3-toml \
    lua5.1-dev lua5.1-lgi \
    --- a/Dockerfile.debian-bookworm-amd64 Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.debian-bookworm-amd64 Mon Oct 04 00:46:58 2021 -0500
    @@ -6,7 +6,7 @@
    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 \
    + libgtk-3-dev libgtk-4-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.debian-bookworm-arm64 Mon Oct 04 00:46:58 2021 -0500
    @@ -0,0 +1,26 @@
    +FROM arm64v8/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 libgtk-4-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-arm64
    +
    +COPY debian/build.sh /build.sh
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.debian-bookworm-armhf Mon Oct 04 00:46:58 2021 -0500
    @@ -0,0 +1,26 @@
    +FROM arm32v7/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 libgtk-4-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-armhf
    +
    +COPY debian/build.sh /build.sh
    +
    --- a/Dockerfile.debian-bullseye-amd64 Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.debian-bullseye-amd64 Mon Oct 04 00:46:58 2021 -0500
    @@ -9,7 +9,7 @@
    libgtk-3-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-pygments python3-toml python3-typogrify \
    - liblua5.3-dev lua-lgi luarocks \
    + liblua5.4-dev lua-lgi luarocks \
    libtcc-dev \
    valac \
    libgjs-dev \
    --- a/Dockerfile.debian-bullseye-arm64 Mon Sep 27 08:52:48 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,28 +0,0 @@
    -FROM arm64v8/debian:bullseye-slim
    -
    -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 DISTRO=debian \
    - VERSION=buster \
    - ARCH=aarch64
    -
    -COPY debian/build.sh /build.sh
    -
    --- a/Dockerfile.debian-bullseye-armhf Mon Sep 27 08:52:48 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,28 +0,0 @@
    -FROM arm32v7/debian:bullseye-slim
    -
    -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 DISTRO=debian \
    - VERSION=buster \
    - ARCH=armhf
    -
    -COPY debian/build.sh /build.sh
    -
    --- a/Dockerfile.fedora-34-amd64 Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.fedora-34-amd64 Mon Oct 04 00:46:58 2021 -0500
    @@ -6,7 +6,7 @@
    redhat-rpm-config rpm-build \
    help2man libxslt gettext \
    glib2-devel gobject-introspection-devel \
    - gtk3-devel \
    + gtk3-devel gtk4-devel \
    lua-devel lua-lgi lua-lpeg \
    python3-devel pygobject3-devel python3-gobject \
    python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    --- a/Dockerfile.fedora-rawhide-amd64 Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.fedora-rawhide-amd64 Mon Oct 04 00:46:58 2021 -0500
    @@ -7,7 +7,7 @@
    redhat-rpm-config rpm-build \
    help2man libxslt gettext \
    glib2-devel gobject-introspection-devel \
    - gtk3-devel \
    + gtk3-devel gtk4-devel \
    lua-devel lua-lgi lua-lpeg \
    python3-devel pygobject3-devel python3-gobject \
    python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    --- a/Dockerfile.i18n Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.i18n Mon Oct 04 00:46:58 2021 -0500
    @@ -1,4 +1,4 @@
    -FROM gplugin/builders:debian-bullseye-amd64
    +FROM gplugin/builders:debian-bookworm-amd64
    COPY i18n/build.sh /
    --- a/Dockerfile.mingw-w64-i686 Mon Sep 27 08:52:48 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,35 +0,0 @@
    -FROM rwgrim/msys2-cross
    -
    -# setup the host os
    -RUN set -ex && \
    - dpkg --add-architecture i386 && \
    - apt-get update && \
    - 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 git meson ninja-build help2man \
    - wine wine32 xauth xvfb \
    - libglib2.0-dev gobject-introspection \
    - valac \
    - && \
    - apt-get clean -y && \
    - rm -rf /var/lib/apt/lists
    -
    -# install our target dependencies
    -RUN set -ex && \
    - pacman-cross -Syy --noconfirm \
    - mingw32/mingw-w64-i686-gobject-introspection \
    - mingw32/mingw-w64-i686-gobject-introspection-runtime \
    - mingw32/mingw-w64-i686-glib2 \
    - mingw32/mingw-w64-i686-gtk3 \
    - mingw32/mingw-w64-i686-python3 \
    - mingw32/mingw-w64-i686-pygobject-devel \
    - mingw32/mingw-w64-i686-lua51 \
    - mingw32/mingw-w64-i686-lua51-lgi
    -
    -CMD ["/build.sh"]
    -
    -ENV MINGW_DISTRO=mingw-w64-i686 PREFIX=/mingw32
    -
    -COPY mingw/build.sh /
    -
    --- a/Dockerfile.mingw-w64-x86_64 Mon Sep 27 08:52:48 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,34 +0,0 @@
    -FROM rwgrim/msys2-cross
    -
    -# 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 git meson ninja-build help2man \
    - wine wine64 xauth xvfb \
    - libglib2.0-dev gobject-introspection \
    - valac \
    - && \
    - apt-get clean -y && \
    - rm -rf /var/lib/apt/lists
    -
    -# install our target dependencies
    -RUN set -ex && \
    - pacman-cross -Syy --noconfirm \
    - mingw64/mingw-w64-x86_64-gobject-introspection \
    - mingw64/mingw-w64-x86_64-gobject-introspection-runtime \
    - mingw64/mingw-w64-x86_64-glib2 \
    - mingw64/mingw-w64-x86_64-gtk3 \
    - mingw64/mingw-w64-x86_64-python3 \
    - mingw64/mingw-w64-x86_64-pygobject-devel \
    - mingw64/mingw-w64-x86_64-lua51 \
    - mingw64/mingw-w64-x86_64-lua51-lgi
    -
    -CMD ["/build.sh"]
    -
    -ENV MINGW_DISTRO=mingw-w64-x86_64 PREFIX=/mingw32
    -
    -COPY mingw/build.sh /
    -
    --- a/Dockerfile.opensuse-tumbleweed-amd64 Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.opensuse-tumbleweed-amd64 Mon Oct 04 00:46:58 2021 -0500
    @@ -2,22 +2,22 @@
    RUN set -ex && \
    zypper --gpg-auto-import-keys refresh && \
    - zypper -n install \
    + zypper install -y \
    ca-certificates-mozilla \
    - meson ninja gcc mercurial git \
    + meson ninja gcc mercurial git pkgconfig \
    rpm-build \
    help2man libxslt-tools gettext-tools \
    glib2-devel gobject-introspection-devel \
    - gtk3-devel \
    + gtk3-devel gtk4-devel \
    python3-devel python3-gobject python3-gobject-devel \
    python3-Jinja2 python3-Markdown python3-MarkupSafe python3-Pygments \
    python3-toml python3-typogrify \
    - lua51-devel lua-lgi \
    + lua54-devel lua53-devel lua51-devel lua-lgi \
    vala \
    libgjs-devel \
    perl-ExtUtils-Config perl-Glib perl-Glib-Object-Introspection \
    - && \
    - zypper -n clean
    + && \
    + zypper clean -y
    CMD ["/build.sh"]
    --- a/Dockerfile.pvs-studio Mon Sep 27 08:52:48 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,22 +0,0 @@
    -FROM gplugin/builders:debian-bullseye-amd64
    -
    -ENV PVS_STUDIO_DOWNLOAD_URL=https://files.viva64.com/pvs-studio-latest.tgz
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends wget strace && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -RUN set -ex && \
    - cd /tmp && \
    - wget -O pvs-studio.tgz ${PVS_STUDIO_DOWNLOAD_URL} && \
    - tar zxf pvs-studio.tgz && \
    - rm pvs-studio.tgz && \
    - cd pvs-studio-* && \
    - ./install.sh && \
    - cd .. && \
    - rm -rf pvs-studio-*
    -
    -COPY pvs-studio/build.sh /
    -
    --- a/Dockerfile.simple Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.simple Mon Oct 04 00:46:58 2021 -0500
    @@ -1,4 +1,4 @@
    -FROM gplugin/builders:debian-bullseye-amd64
    +FROM gplugin/builders:debian-bookworm-amd64
    COPY meson/build.sh /
    --- a/Dockerfile.ubuntu-hirsute-amd64 Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.ubuntu-hirsute-amd64 Mon Oct 04 00:46:58 2021 -0500
    @@ -16,7 +16,7 @@
    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 \
    + libgtk-3-dev libgtk-4-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    --- a/Dockerfile.valgrind Mon Sep 27 08:52:48 2021 -0500
    +++ b/Dockerfile.valgrind Mon Oct 04 00:46:58 2021 -0500
    @@ -5,7 +5,7 @@
    dnf reinstall -y --setopt=tsflags= python3-devel && \
    dnf debuginfo-install -y \
    glib2-devel gobject-introspection-devel \
    - gtk3-devel \
    + gtk3-devel gtk4-devel \
    lua-devel lua-lgi lua-lpeg \
    python3-devel pygobject3-devel python3-gobject \
    perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    --- a/convey.yml Mon Sep 27 08:52:48 2021 -0500
    +++ b/convey.yml Mon Oct 04 00:46:58 2021 -0500
    @@ -65,23 +65,18 @@
    stages:
    - tasks: [import, build]
    - debian-bullseye-amd64:
    - environment: [TARGET=debian-bullseye-amd64]
    + debian-bookworm-amd64:
    + environment: TARGET=debian-bookworm-amd64
    stages:
    - tasks: [import, build]
    - debian-bullseye-arm64:
    - environment: [TARGET=debian-bullseye-arm64]
    + debian-bookworm-arm64:
    + environment: [TARGET=debian-bookworm-arm64]
    stages:
    - tasks: [import, build]
    - debian-bullseye-armhf:
    - environment: [TARGET=debian-bullseye-armhf]
    - stages:
    - - tasks: [import, build]
    -
    - debian-bookworm-amd64:
    - environment: TARGET=debian-bookworm-amd64
    + debian-bookworm-armhf:
    + environment: [TARGET=debian-bookworm-armhf]
    stages:
    - tasks: [import, build]
    @@ -105,16 +100,6 @@
    stages:
    - tasks: [import, build]
    - mingw-w64-i686:
    - environment: [TARGET=mingw-w64-i686]
    - stages:
    - - tasks: [import, build]
    -
    - mingw-w64-x86_64:
    - environment: [TARGET=mingw-w64-x86_64]
    - stages:
    - - tasks: [import, build]
    -
    opensuse-tumbleweed-amd64:
    environment: [TARGET=opensuse-tumbleweed-amd64]
    stages:
    --- a/mingw/build.sh Mon Sep 27 08:52:48 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,29 +0,0 @@
    -#!/bin/sh -ex
    -# Copyright (C) 2015-2019 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}"
    -
    -mkdir -p "${MINGW_DISTRO}"
    -
    -PKGBUILD_DIR=${PKGBUILD_DIR:-mingw}
    -
    -cp "${CONVEY_WORKSPACE}/packaging/${PKGBUILD_DIR}/PKGBUILD" .
    -
    -MINGW_PACKAGE_PREFIX="${MINGW_DISTRO}" xvfb-run makepkg-cross ${MAKEPKG_ARGS}
    -
    -mv *.tar.zst "${CONVEY_WORKSPACE}/${MINGW_DISTRO}"
    -
    --- a/pvs-studio/build.sh Mon Sep 27 08:52:48 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,69 +0,0 @@
    -#!/bin/sh -ex
    -# Copyright (C) 2015-2019 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}
    -
    -PVS_IGNORED_CODES=${PVS_IGNORED_CODES:-}
    -
    -BUILD_DIR="build-pvs-studio"
    -PLOG_ARGS="--excludedCodes V011,V1042"
    -
    -if [ -n "${PVS_IGNORED_CODES}" ]; then
    - PLOG_ARGS="${PLOG_ARGS},${PVS_IGNORED_CODES}"
    -fi
    -
    -# don't leak our secrets via `set -x`
    -set +x
    -if [ -z "${PVS_STUDIO_USERNAME}" -o -z "${PVS_STUDIO_KEY}" ] ; then
    - echo "Both PVS_STUDIO_USERNAME and PVS_STUDIO_KEY must be provided" >&2
    - exit 1
    -fi
    -set -x
    -
    -# don't echo commands as we're stashing secrets
    -set +x
    -echo "${PVS_STUDIO_USERNAME}" > /tmp/license
    -echo "${PVS_STUDIO_KEY}" >> /tmp/license
    -set -x
    -
    -meson ${BUILD_DIR}
    -cd ${BUILD_DIR}
    -
    -echo "running ninja because we don't have a way to just generate the built source files" >&2
    -ninja
    -
    -echo "creating compile_commands.json"
    -ninja -t compdb
    -
    -# run the analyzer
    -pvs-studio-analyzer analyze -l /tmp/license -o pvs-studio.log
    -
    -# convert the output to html
    -plog-converter -a GA:1,2 -t fullhtml -o pvs-studio -p ${HG_REMOTE} -v ${HG_COMMIT} ${PLOG_ARGS} pvs-studio.log
    -cp -a pvs-studio ${CONVEY_WORKSPACE}
    -
    -# run the converter to determine if we found issues
    -plog-converter -a GA:1,2 -t tasklist ${PLOG_ARGS} -o ${CONVEY_WORKSPACE}/pvs-studio/tasklist.txt pvs-studio.log
    -ERRORS=$(wc -l ${CONVEY_WORKSPACE}/pvs-studio/tasklist.txt | awk '{print $1}')
    -# the tasklist output has a stock line at the top, which we ignore by checking
    -# if we have more than one line in the file
    -if [ "${ERRORS}" -gt 1 ] ; then
    - exit 1
    -fi
    -
    -exit 0
    -