talkatu/builders

Add a fedora-32-amd64 image and remove the no longer supported fedora-29-amd64 image

2020-04-28, Gary Kramlich
41ac3f32897e
Parents 45af16705bf9
Children 735a0fe312da
Add a fedora-32-amd64 image and remove the no longer supported fedora-29-amd64 image
3 files changed, 26 insertions(+), 30 deletions(-)
  • +0 -25
    Dockerfile.fedora-29-amd64
  • +21 -0
    Dockerfile.fedora-32-amd64
  • +5 -5
    convey.yml
    • --- a/Dockerfile.fedora-29-amd64 Tue Apr 28 23:13:49 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,25 +0,0 @@
    -# vi:et:ft=dockerfile
    -FROM fedora:29
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    -RUN set -ex && \
    - dnf install -y \
    - python2-devel python2-pip \
    - meson ninja-build gcc xorg-x11-server-Xvfb \
    - redhat-rpm-config rpm-build \
    - help2man gettext \
    - glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
    - cmark-devel gspell-devel gumbo-parser-devel glade-devel
    -
    -RUN set -ex && \
    - pip install mercurial
    -
    -CMD ["/build.sh"]
    -
    -ENV DISTRIBUTION=fedora \
    - VERSION=29 \
    - ARCH=amd64
    -
    -COPY rpm/build.sh /build.sh
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-32-amd64 Tue Apr 28 23:59:24 2020 -0500
    @@ -0,0 +1,21 @@
    +# vi:et:ft=dockerfile
    +FROM fedora:31
    +
    +MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +
    +RUN set -ex && \
    + dnf install -y \
    + meson ninja-build gcc mercurial xorg-x11-server-Xvfb \
    + redhat-rpm-config rpm-build \
    + help2man gettext \
    + glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
    + cmark-devel gspell-devel gumbo-parser-devel glade-devel
    +
    +CMD ["/build.sh"]
    +
    +ENV DISTRIBUTION=fedora \
    + VERSION=31 \
    + ARCH=amd64
    +
    +COPY rpm/build.sh /build.sh
    +
    --- a/convey.yml Tue Apr 28 23:13:49 2020 -0500
    +++ b/convey.yml Tue Apr 28 23:59:24 2020 -0500
    @@ -63,11 +63,6 @@
    stages:
    - tasks: [import, build]
    - fedora-29-amd64:
    - environment: TARGET=fedora-29-amd64
    - stages:
    - - tasks: [import, build]
    -
    fedora-30-amd64:
    environment: TARGET=fedora-30-amd64
    stages:
    @@ -78,6 +73,11 @@
    stages:
    - tasks: [import, build]
    + fedora-32-amd64:
    + environment: TARGET=fedora-32-amd64
    + stages:
    + - tasks: [import, build]
    +
    fedora-rawhide-amd64:
    environment: TARGET=fedora-rawhide-amd64
    stages: