gplugin/builders

Add fedora 33 and ubuntu groofy, remove fedora 30 and fix a bug in fedora 32

2020-09-06, Gary Kramlich
9846af3f1f4d
Parents d000a9f49e96
Children 03a22a9b72ad
Add fedora 33 and ubuntu groofy, remove fedora 30 and fix a bug in fedora 32
5 files changed, 75 insertions(+), 31 deletions(-)
  • +0 -24
    Dockerfile.fedora-30-amd64
  • +1 -1
    Dockerfile.fedora-32-amd64
  • +24 -0
    Dockerfile.fedora-33-amd64
  • +39 -0
    Dockerfile.ubuntu-groovy-amd64
  • +11 -6
    convey.yml
    • --- a/Dockerfile.fedora-30-amd64 Mon Jul 06 02:39:24 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,24 +0,0 @@
    -FROM fedora:30
    -
    -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=30 \
    - ARCH=amd64
    -
    -COPY rpm/build.sh /build.sh
    --- a/Dockerfile.fedora-32-amd64 Mon Jul 06 02:39:24 2020 -0500
    +++ b/Dockerfile.fedora-32-amd64 Sun Sep 06 00:08:55 2020 -0500
    @@ -18,7 +18,7 @@
    CMD ["/build.sh"]
    ENV DISTRIBUTION=fedora \
    - VERSION=rawhide \
    + VERSION=32 \
    ARCH=amd64
    COPY rpm/build.sh /build.sh
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-33-amd64 Sun Sep 06 00:08:55 2020 -0500
    @@ -0,0 +1,24 @@
    +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.ubuntu-groovy-amd64 Sun Sep 06 00:08:55 2020 -0500
    @@ -0,0 +1,39 @@
    +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
    +
    --- a/convey.yml Mon Jul 06 02:39:24 2020 -0500
    +++ b/convey.yml Sun Sep 06 00:08:55 2020 -0500
    @@ -84,11 +84,6 @@
    stages:
    - tasks: [import, build]
    - fedora-30-amd64:
    - environment: [TARGET=fedora-30-amd64]
    - stages:
    - - tasks: [import, build]
    -
    fedora-31-amd64:
    environment: [TARGET=fedora-31-amd64]
    stages:
    @@ -99,6 +94,11 @@
    stages:
    - tasks: [import, build]
    + fedora-33-amd64:
    + environment: [TARGET=fedora-33-amd64]
    + stages:
    + - tasks: [import, build]
    +
    fedora-rawhide-amd64:
    environment: [TARGET=fedora-rawhide-amd64]
    stages:
    @@ -144,6 +144,11 @@
    stages:
    - tasks: [import, build]
    + ubuntu-groovy-amd64:
    + environment: [TARGET=ubuntu-groovy-amd64]
    + stages:
    + - tasks: [import, build]
    +
    valgrind:
    environment: [TARGET=valgrind]
    stages:
    @@ -156,9 +161,9 @@
    - clang-format
    - debian-bullseye-amd64
    - dist
    - - fedora-30-amd64
    - fedora-31-amd64
    - fedora-32-amd64
    + - fedora-33-amd64
    - fedora-rawhide-amd64
    - i18n
    - mingw-w64-i686