pidgin/builders

Replace fedora 34 with 35, remove debian bullseye, and fix a s/hirsute/jammy that was missed

2021-12-14, Gary Kramlich
645101211ca2
Parents cf9669cbe9cd
Children ef3b4787bdd3
Replace fedora 34 with 35, remove debian bullseye, and fix a s/hirsute/jammy that was missed
4 files changed, 52 insertions(+), 118 deletions(-)
  • +0 -65
    Dockerfile.debian-bullseye-amd64
  • +0 -48
    Dockerfile.fedora-34-amd64
  • +48 -0
    Dockerfile.fedora-35-amd64
  • +4 -5
    convey.yml
    • --- a/Dockerfile.debian-bullseye-amd64 Tue Dec 14 05:24:19 2021 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,65 +0,0 @@
    -FROM debian:bullseye
    -
    -ENV TARGET=debian-bullseye-amd64
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates \
    - wget apt-transport-https gnupg \
    - build-essential intltool ninja-build mercurial devscripts git \
    - libgirepository1.0-dev gobject-introspection \
    - python3-dev python3-pip \
    - 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 \
    - python3-jinja2 \
    - python3-markdown \
    - python3-markupsafe \
    - python3-toml \
    - python3-typogrify \
    - && \
    - pip3 install meson && \
    - 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 build-subproject.sh /usr/local/bin/build.sh
    -
    -CMD ["build.sh"]
    -
    --- a/Dockerfile.fedora-34-amd64 Tue Dec 14 05:24:19 2021 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,48 +0,0 @@
    -FROM fedora:34
    -
    -ENV TARGET=fedora-34-amd64
    -
    -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 \
    - gi-docgen
    -
    -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 build-subproject.sh /usr/local/bin/build.sh
    -
    -CMD ["build.sh"]
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-35-amd64 Tue Dec 14 06:46:00 2021 -0600
    @@ -0,0 +1,48 @@
    +FROM fedora:35
    +
    +ENV TARGET=fedora-35-amd64
    +
    +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 \
    + gi-docgen
    +
    +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 build-subproject.sh /usr/local/bin/build.sh
    +
    +CMD ["build.sh"]
    +
    --- a/convey.yml Tue Dec 14 05:24:19 2021 -0600
    +++ b/convey.yml Tue Dec 14 06:46:00 2021 -0600
    @@ -65,8 +65,8 @@
    stages:
    - tasks: [import, build]
    - fedora-34-amd64:
    - environment: TARGET=fedora-34-amd64
    + fedora-35-amd64:
    + environment: TARGET=fedora-35-amd64
    stages:
    - tasks: [import, build]
    @@ -92,8 +92,7 @@
    plans:
    - appimage-x86_64
    - clang
    - - debian-bullseye-amd64
    - debian-bookworm-amd64
    - - fedora-34-amd64
    + - fedora-35-amd64
    - scanbuild
    - - ubuntu-hirsute-amd64
    + - ubuntu-jammy-amd64