pidgin/builders

Add a debian-bookworm-amd64 image and clean up a bunch of other stuff

2021-09-30, Gary Kramlich
ac4512d5ae15
Parents 8da87f9837b1
Children b4195fc79f54
Add a debian-bookworm-amd64 image and clean up a bunch of other stuff
9 files changed, 18 insertions(+), 94 deletions(-)
  • +1 -1
    Dockerfile.clang
  • +1 -1
    Dockerfile.debian-bookworm-amd64
  • +1 -1
    Dockerfile.debian-bullseye-amd64
  • +3 -2
    Dockerfile.fedora-34-amd64
  • +0 -53
    Dockerfile.mingw-w64-x86_64
  • +0 -24
    Dockerfile.pvs-studio
  • +1 -1
    Dockerfile.scanbuild
  • +1 -1
    Dockerfile.ubuntu-hirsute-amd64
  • +10 -10
    convey.yml
    • --- a/Dockerfile.clang Wed Sep 29 02:09:21 2021 -0500
    +++ b/Dockerfile.clang Thu Sep 30 03:39:20 2021 -0500
    @@ -1,4 +1,4 @@
    -FROM pidgin/builders:debian-bullseye-amd64
    +FROM pidgin/builders:debian-bookworm-amd64
    ENV TARGET=clang
    --- a/Dockerfile.debian-bookworm-amd64 Wed Sep 29 02:09:21 2021 -0500
    +++ b/Dockerfile.debian-bookworm-amd64 Thu Sep 30 03:39:20 2021 -0500
    @@ -1,6 +1,6 @@
    FROM debian:bookworm
    -ENV TARGET=debian
    +ENV TARGET=debian-bookworm-amd64
    RUN set -ex && \
    apt-get update && \
    --- a/Dockerfile.debian-bullseye-amd64 Wed Sep 29 02:09:21 2021 -0500
    +++ b/Dockerfile.debian-bullseye-amd64 Thu Sep 30 03:39:20 2021 -0500
    @@ -1,6 +1,6 @@
    FROM debian:bullseye
    -ENV TARGET=debian
    +ENV TARGET=debian-bullseye-amd64
    RUN set -ex && \
    apt-get update && \
    --- a/Dockerfile.fedora-34-amd64 Wed Sep 29 02:09:21 2021 -0500
    +++ b/Dockerfile.fedora-34-amd64 Thu Sep 30 03:39:20 2021 -0500
    @@ -1,6 +1,6 @@
    FROM fedora:34
    -ENV TARGET=fedora
    +ENV TARGET=fedora-34-amd64
    RUN set -ex && \
    dnf update -y && \
    @@ -27,7 +27,8 @@
    meanwhile-devel \
    avahi-devel avahi-glib-devel \
    gmime30-devel \
    - libgadu-devel
    + libgadu-devel \
    + gi-docgen
    RUN set -ex && \
    cd /tmp && \
    --- a/Dockerfile.mingw-w64-x86_64 Wed Sep 29 02:09:21 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,53 +0,0 @@
    -# vi:et:ft=dockerfile
    -FROM rwgrim/msys2-cross:latest
    -
    -# setup the cross compile and 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-x86-64-dev mingw-w64-tools \
    - mercurial meson ninja-build help2man git \
    - wine wine32 wine64 \
    - libglib2.0-dev gobject-introspection \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -# install our target depedencies this includes talkatu and gplugin for now
    -RUN set -ex && \
    - pacman-cross -Syy --noconfirm \
    - mingw64/mingw-w64-x86_64-adwaita-icon-theme \
    - mingw64/mingw-w64-x86_64-ca-certificates \
    - mingw64/mingw-w64-x86_64-cmark \
    - mingw64/mingw-w64-x86_64-farstream \
    - mingw64/mingw-w64-x86_64-fontconfig \
    - mingw64/mingw-w64-x86_64-freetype \
    - mingw64/mingw-w64-x86_64-gettext \
    - mingw64/mingw-w64-x86_64-glade \
    - mingw64/mingw-w64-x86_64-glib2 \
    - mingw64/mingw-w64-x86_64-gobject-introspection \
    - mingw64/mingw-w64-x86_64-gobject-introspection-runtime \
    - mingw64/mingw-w64-x86_64-gspell \
    - mingw64/mingw-w64-x86_64-gtk-doc \
    - mingw64/mingw-w64-x86_64-gtk3 \
    - mingw64/mingw-w64-x86_64-gumbo-parser \
    - mingw64/mingw-w64-x86_64-libgadu \
    - mingw64/mingw-w64-x86_64-libidn \
    - mingw64/mingw-w64-x86_64-libsoup \
    - mingw64/mingw-w64-x86_64-libxml2 \
    - mingw64/mingw-w64-x86_64-lua51 \
    - mingw64/mingw-w64-x86_64-lua51-lgi \
    - mingw64/mingw-w64-x86_64-ncurses \
    - mingw64/mingw-w64-x86_64-pygobject-devel \
    - mingw64/mingw-w64-x86_64-python3 \
    - mingw64/mingw-w64-x86_64-zlib
    -
    -# set up all of our wrappers and other fun stuff..
    -CMD ["/build.sh"]
    -
    -ENV MINGW_DISTRO=mingw-w64-x86_64 PREFIX=/mingw64
    -
    -COPY build-mingw.sh /build.sh
    -
    --- a/Dockerfile.pvs-studio Wed Sep 29 02:09:21 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,24 +0,0 @@
    -FROM pidgin/builders:debian-bullseye-amd64
    -
    -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 && \
    - 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 build-pvs-studio.sh /usr/local/bin/build.sh
    -
    --- a/Dockerfile.scanbuild Wed Sep 29 02:09:21 2021 -0500
    +++ b/Dockerfile.scanbuild Thu Sep 30 03:39:20 2021 -0500
    @@ -1,4 +1,4 @@
    -FROM pidgin/builders:debian-bullseye-amd64
    +FROM pidgin/builders:debian-bookworm-amd64
    MAINTAINER Gary Kramlich <grim@reaperworld.com>
    --- a/Dockerfile.ubuntu-hirsute-amd64 Wed Sep 29 02:09:21 2021 -0500
    +++ b/Dockerfile.ubuntu-hirsute-amd64 Thu Sep 30 03:39:20 2021 -0500
    @@ -1,6 +1,6 @@
    FROM ubuntu:hirsute
    -ENV TARGET=ubuntu
    +ENV TARGET=ubuntu-hirsute-amd64
    COPY ubuntu/tzdata.selections /
    --- a/convey.yml Wed Sep 29 02:09:21 2021 -0500
    +++ b/convey.yml Thu Sep 30 03:39:20 2021 -0500
    @@ -70,11 +70,6 @@
    stages:
    - tasks: [import, build]
    - mingw-w64-x86_64:
    - environment: TARGET=mingw-w64-x86_64
    - stages:
    - - tasks: [import, build]
    -
    publish:
    environment: [REGISTRY_USERNAME, REGISTRY_PASSWORD]
    stages:
    @@ -82,11 +77,6 @@
    - tasks: [logout]
    run: always
    - pvs-studio:
    - environment: TARGET=pvs-studio
    - stages:
    - - tasks: [import, build]
    -
    scanbuild:
    environment: TARGET=scanbuild
    stages:
    @@ -97,3 +87,13 @@
    stages:
    - tasks: [import, build]
    +meta-plans:
    + all:
    + plans:
    + - appimage-x86_64
    + - clang
    + - debian-bullseye-amd64
    + - debian-bookworm-amd64
    + - fedora-34-amd64
    + - scanbuild
    + - ubuntu-hirsute-amd64