gplugin/builders

Update the fedora images.

19 months ago, Gary Kramlich
dd0e08640e72
Parents 2389f8b9564e
Children a2f091bb06f9
Update the fedora images.

Replace 34 with 36
Make sure everything has gtk4 and adwaita
4 files changed, 26 insertions(+), 25 deletions(-)
  • +0 -21
    Dockerfile.fedora-34-amd64
  • +22 -0
    Dockerfile.fedora-36-amd64
  • +1 -1
    Dockerfile.fedora-rawhide-amd64
  • +3 -3
    convey.yml
    • --- a/Dockerfile.fedora-34-amd64 Mon Dec 27 04:30:16 2021 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,21 +0,0 @@
    -FROM fedora:34
    -
    -RUN set -ex && \
    - dnf install -y \
    - meson ninja-build gcc mercurial git \
    - redhat-rpm-config rpm-build \
    - help2man libxslt gettext \
    - glib2-devel gobject-introspection-devel \
    - gtk3-devel gtk4-devel \
    - lua-devel lua-lgi lua-lpeg \
    - python3-devel pygobject3-devel python3-gobject \
    - python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    - vala \
    - gjs-devel \
    - perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    -
    -CMD ["/build.sh"]
    -
    -ENV TARGET=fedora-34-amd64
    -
    -COPY rpm/build.sh /build.sh
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-36-amd64 Sat Sep 17 08:05:47 2022 -0500
    @@ -0,0 +1,22 @@
    +FROM fedora:36
    +
    +RUN set -ex && \
    + dnf update -y && \
    + dnf install -y \
    + meson ninja-build gcc mercurial git \
    + redhat-rpm-config rpm-build \
    + help2man libxslt gettext \
    + glib2-devel gobject-introspection-devel \
    + gtk4-devel libadwaita-devel \
    + lua-devel lua-lgi lua-lpeg \
    + python3-devel pygobject3-devel python3-gobject \
    + python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    + vala \
    + gjs-devel \
    + perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    +
    +CMD ["/build.sh"]
    +
    +ENV TARGET=fedora-36-amd64
    +
    +COPY rpm/build.sh /build.sh
    --- a/Dockerfile.fedora-rawhide-amd64 Mon Dec 27 04:30:16 2021 -0600
    +++ b/Dockerfile.fedora-rawhide-amd64 Sat Sep 17 08:05:47 2022 -0500
    @@ -7,7 +7,7 @@
    redhat-rpm-config rpm-build \
    help2man libxslt gettext \
    glib2-devel gobject-introspection-devel \
    - gtk3-devel gtk4-devel \
    + gtk4-devel libadwaita-devel \
    lua-devel lua-lgi lua-lpeg \
    python3-devel pygobject3-devel python3-gobject \
    python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    --- a/convey.yml Mon Dec 27 04:30:16 2021 -0600
    +++ b/convey.yml Sat Sep 17 08:05:47 2022 -0500
    @@ -85,8 +85,8 @@
    stages:
    - tasks: [import, build]
    - fedora-34-amd64:
    - environment: [TARGET=fedora-34-amd64]
    + fedora-36-amd64:
    + environment: [TARGET=fedora-36-amd64]
    stages:
    - tasks: [import, build]
    @@ -133,7 +133,7 @@
    - debian-bookworm-amd64
    - debian-bullseye-amd64
    - dist
    - - fedora-34-amd64
    + - fedora-36-amd64
    - fedora-rawhide-amd64
    - i18n
    - mingw-w64-i686