talkatu/builders

Removed fedora 30 and make sure fedora 32 builds fedora 32

2020-05-21, Gary Kramlich
735a0fe312da
Parents 41ac3f32897e
Children 02c493a6d5b5
Removed fedora 30 and make sure fedora 32 builds fedora 32
3 files changed, 4 insertions(+), 29 deletions(-)
  • +0 -21
    Dockerfile.fedora-30-amd64
  • +4 -3
    Dockerfile.fedora-32-amd64
  • +0 -5
    convey.yml
    • --- a/Dockerfile.fedora-30-amd64 Tue Apr 28 23:59:24 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,21 +0,0 @@
    -# vi:et:ft=dockerfile
    -FROM fedora:30
    -
    -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=30 \
    - ARCH=amd64
    -
    -COPY rpm/build.sh /build.sh
    -
    --- a/Dockerfile.fedora-32-amd64 Tue Apr 28 23:59:24 2020 -0500
    +++ b/Dockerfile.fedora-32-amd64 Thu May 21 22:05:09 2020 -0500
    @@ -1,5 +1,5 @@
    # vi:et:ft=dockerfile
    -FROM fedora:31
    +FROM fedora:32
    MAINTAINER Gary Kramlich <grim@reaperworld.com>
    @@ -9,12 +9,13 @@
    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
    + cmark-devel gspell-devel gumbo-parser-devel glade-devel \
    + vala
    CMD ["/build.sh"]
    ENV DISTRIBUTION=fedora \
    - VERSION=31 \
    + VERSION=32 \
    ARCH=amd64
    COPY rpm/build.sh /build.sh
    --- a/convey.yml Tue Apr 28 23:59:24 2020 -0500
    +++ b/convey.yml Thu May 21 22:05:09 2020 -0500
    @@ -63,11 +63,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: