pidgin/builders

remove the subproject-build as we now do that build across debian, fedora, and finch

2021-06-12, Gary Kramlich
242f4e0e9a08
Parents 6b6a9ce626d0
Children 89df7465cfcb
remove the subproject-build as we now do that build across debian, fedora, and finch
11 files changed, 87 insertions(+), 171 deletions(-)
  • +14 -0
    Dockerfile.clang
  • +14 -4
    Dockerfile.debian-bullseye-amd64
  • +0 -50
    Dockerfile.debian-buster-amd64
  • +47 -0
    Dockerfile.fedora-34-amd64
  • +1 -1
    Dockerfile.pvs-studio
  • +1 -1
    Dockerfile.scanbuild
  • +0 -59
    Dockerfile.subproject-build
  • +0 -48
    Dockerfile.subproject-build-clang
  • +1 -1
    Dockerfile.ubuntu-hirsute-amd64
  • +7 -7
    convey.yml
  • +2 -0
    subproject-build/build.sh
    • --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.clang Sat Jun 12 04:51:39 2021 -0500
    @@ -0,0 +1,14 @@
    +FROM pidgin/builders:debian-bullseye-amd64
    +
    +ENV TARGET=clang
    +
    +RUN set -ex && \
    + apt-get update && \
    + apt-get install -y --no-install-recommends clang && \
    + apt-get clean && \
    + rm -rf /var/lib/apt/lists
    +
    +ENV CC=clang CXX=clang++
    +
    +CMD ["build.sh"]
    +
    --- a/Dockerfile.debian-bullseye-amd64 Fri Jun 11 22:13:29 2021 -0500
    +++ b/Dockerfile.debian-bullseye-amd64 Sat Jun 12 04:51:39 2021 -0500
    @@ -1,8 +1,6 @@
    FROM debian:bullseye
    -ENV DISTRO=debian
    -ENV VERSION=buster
    -ENV ARCH=amd64
    +ENV TARGET=debian
    RUN set -ex && \
    apt-get update && \
    @@ -43,7 +41,19 @@
    apt-get clean && \
    rm -rf /var/lib/apt/lists
    -COPY simple/build.sh /usr/local/bin/build.sh
    +RUN set -ex && \
    + cd /tmp && \
    + wget https://downloads.sourceforge.net/project/silc/silc/toolkit/sources/silc-toolkit-1.1.12.tar.bz2 && \
    + tar jxf silc-toolkit-1.1.12.tar.bz2 && \
    + cd silc-toolkit-1.1.12 && \
    + ./configure && \
    + make -s && \
    + make install && \
    + ldconfig && \
    + cd .. && \
    + rm -rf silc-toolkit*
    +
    +COPY subproject-build/build.sh /usr/local/bin/build.sh
    CMD ["build.sh"]
    --- a/Dockerfile.debian-buster-amd64 Fri Jun 11 22:13:29 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,50 +0,0 @@
    -FROM debian:buster
    -
    -ENV DISTRO=debian
    -ENV VERSION=buster
    -ENV ARCH=amd64
    -
    -RUN set -ex && \
    - 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 \
    - ca-certificates \
    - wget apt-transport-https gnupg \
    - meson build-essential intltool mercurial devscripts git \
    - libgirepository1.0-dev gobject-introspection \
    - python3-dev \
    - libidn11-dev libnss3-dev \
    - libavahi-glib-dev libavahi-client-dev \
    - libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    - libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - libgtk-3-dev libgtk-3-bin help2man \
    - gtk-doc-tools \
    - libnice-dev \
    - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    - gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    - libmeanwhile-dev \
    - libfarstream-0.2-dev \
    - libenchant-dev \
    - libxss-dev \
    - libncurses5-dev \
    - libgadu-dev \
    - libsecret-1-dev \
    - python3-dev python-gi-dev python3-gi \
    - liblua5.1-0-dev lua-lgi luarocks \
    - libtcc-dev \
    - valac \
    - libgjs-dev \
    - cmake \
    - libkf5wallet-dev \
    - libsoup2.4-dev \
    - libperl-dev libglib-perl libglib-object-introspection-perl \
    - evolution-data-server-dev libedataserver1.2-dev libebook1.2-dev libedata-book1.2-dev \
    - libcanberra-dev \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -COPY simple/build.sh /usr/local/bin/build.sh
    -
    -CMD ["build.sh"]
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-34-amd64 Sat Jun 12 04:51:39 2021 -0500
    @@ -0,0 +1,47 @@
    +FROM fedora:34
    +
    +ENV TARGET=fedora
    +
    +RUN set -ex && \
    + dnf update -y && \
    + dnf install -y \
    + meson cmake ninja-build gcc g++ mercurial git \
    + wget 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 \
    + cmark-devel gspell-devel gumbo-parser-devel \
    + libnice-devel libhandy-devel json-glib-devel \
    + gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good \
    + libcanberra-devel \
    + libidn-devel libidn2-devel \
    + ncurses-devel \
    + libsecret-devel kf5-kwallet-devel \
    + cyrus-sasl-devel \
    + farstream02-devel \
    + meanwhile-devel \
    + avahi-devel avahi-glib-devel \
    + gmime30-devel \
    + libgadu-devel
    +
    +RUN set -ex && \
    + cd /tmp && \
    + wget https://downloads.sourceforge.net/project/silc/silc/toolkit/sources/silc-toolkit-1.1.12.tar.bz2 && \
    + tar jxf silc-toolkit-1.1.12.tar.bz2 && \
    + cd silc-toolkit-1.1.12 && \
    + ./configure && \
    + make -s && \
    + make install && \
    + ldconfig && \
    + cd .. && \
    + rm -rf silc-toolkit*
    +
    +COPY subproject-build/build.sh /usr/local/bin/build.sh
    +
    +CMD ["build.sh"]
    +
    --- a/Dockerfile.pvs-studio Fri Jun 11 22:13:29 2021 -0500
    +++ b/Dockerfile.pvs-studio Sat Jun 12 04:51:39 2021 -0500
    @@ -1,4 +1,4 @@
    -FROM pidgin/builders:subproject-build
    +FROM pidgin/builders:debian-bullseye-amd64
    ENV PVS_STUDIO_DOWNLOAD_URL=https://files.viva64.com/pvs-studio-latest.tgz
    --- a/Dockerfile.scanbuild Fri Jun 11 22:13:29 2021 -0500
    +++ b/Dockerfile.scanbuild Sat Jun 12 04:51:39 2021 -0500
    @@ -1,4 +1,4 @@
    -FROM pidgin/builders:subproject-build
    +FROM pidgin/builders:debian-bullseye-amd64
    MAINTAINER Gary Kramlich <grim@reaperworld.com>
    --- a/Dockerfile.subproject-build Fri Jun 11 22:13:29 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,59 +0,0 @@
    -FROM debian:bullseye
    -
    -ENV TARGET=subproject-build
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates \
    - wget apt-transport-https gnupg \
    - meson build-essential intltool mercurial devscripts git \
    - libgirepository1.0-dev gobject-introspection \
    - python3-dev \
    - libidn11-dev libnss3-dev \
    - libavahi-glib-dev libavahi-client-dev \
    - libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    - libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - libgtk-3-dev libgtk-3-bin help2man \
    - gtk-doc-tools \
    - libnice-dev \
    - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    - gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    - libmeanwhile-dev \
    - libfarstream-0.2-dev \
    - libxss-dev \
    - libncurses5-dev \
    - libgadu-dev \
    - libsecret-1-dev \
    - python3-dev python-gi-dev python3-gi \
    - liblua5.1-0-dev lua-lgi luarocks \
    - libtcc-dev \
    - valac \
    - libgjs-dev \
    - cmake \
    - libkf5wallet-dev \
    - libsoup2.4-dev \
    - libperl-dev libglib-perl libglib-object-introspection-perl \
    - evolution-data-server-dev libedataserver1.2-dev libebook1.2-dev libedata-book1.2-dev \
    - libcanberra-dev \
    - libhandy-1-dev \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -RUN set -ex && \
    - cd /tmp && \
    - wget https://downloads.sourceforge.net/project/silc/silc/toolkit/sources/silc-toolkit-1.1.12.tar.bz2 && \
    - tar jxf silc-toolkit-1.1.12.tar.bz2 && \
    - cd silc-toolkit-1.1.12 && \
    - ./configure && \
    - make -s && \
    - make install && \
    - ldconfig && \
    - cd .. && \
    - rm -rf silc-toolkit*
    -
    -COPY subproject-build/build.sh /usr/local/bin/build.sh
    -
    -CMD ["build.sh"]
    -
    --- a/Dockerfile.subproject-build-clang Fri Jun 11 22:13:29 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,48 +0,0 @@
    -FROM debian:bullseye
    -
    -ENV TARGET=subproject-build
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates \
    - wget apt-transport-https gnupg \
    - meson build-essential intltool mercurial devscripts git clang \
    - libgirepository1.0-dev gobject-introspection \
    - python3-dev \
    - libidn11-dev libnss3-dev \
    - libavahi-glib-dev libavahi-client-dev \
    - libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    - libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - libgtk-3-dev libgtk-3-bin help2man \
    - gtk-doc-tools \
    - libnice-dev \
    - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    - gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    - libmeanwhile-dev \
    - libfarstream-0.2-dev \
    - libxss-dev \
    - libncurses5-dev \
    - libgadu-dev \
    - libsecret-1-dev \
    - python3-dev python-gi-dev python3-gi \
    - liblua5.1-0-dev lua-lgi luarocks \
    - libtcc-dev \
    - valac \
    - libgjs-dev \
    - cmake \
    - libkf5wallet-dev \
    - libsoup2.4-dev \
    - libperl-dev libglib-perl libglib-object-introspection-perl \
    - evolution-data-server-dev libedataserver1.2-dev libebook1.2-dev libedata-book1.2-dev \
    - libcanberra-dev \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -COPY simple/build.sh /usr/local/bin/build.sh
    -
    -ENV CC=clang
    -
    -CMD ["build.sh"]
    -
    --- a/Dockerfile.ubuntu-hirsute-amd64 Fri Jun 11 22:13:29 2021 -0500
    +++ b/Dockerfile.ubuntu-hirsute-amd64 Sat Jun 12 04:51:39 2021 -0500
    @@ -1,6 +1,6 @@
    FROM ubuntu:hirsute
    -ENV TARGET=subproject-build
    +ENV TARGET=ubuntu
    COPY ubuntu/tzdata.selections /
    --- a/convey.yml Fri Jun 11 22:13:29 2021 -0500
    +++ b/convey.yml Sat Jun 12 04:51:39 2021 -0500
    @@ -60,18 +60,18 @@
    stages:
    - tasks: [import, build]
    + fedora-34-amd64:
    + environment: TARGET=fedora-34-amd64
    + stages:
    + - tasks: [import, build]
    +
    mingw-w64-x86_64:
    environment: TARGET=mingw-w64-x86_64
    stages:
    - tasks: [import, build]
    - subproject-build:
    - environment: TARGET=subproject-build
    - stages:
    - - tasks: [import, build]
    -
    - subproject-build-clang:
    - environment: TARGET=subproject-build-clang
    + clang:
    + environment: TARGET=clang
    stages:
    - tasks: [import, build]
    --- a/subproject-build/build.sh Fri Jun 11 22:13:29 2021 -0500
    +++ b/subproject-build/build.sh Sat Jun 12 04:51:39 2021 -0500
    @@ -6,6 +6,8 @@
    BUILD_DIR="build-${TARGET}"
    +export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig
    +
    meson -Dsilc=enabled -Ddoc=true "${BUILD_DIR}"
    ninja -C "${BUILD_DIR}" test
    ninja -C "${BUILD_DIR}" pidgin-pot