gplugin/builders

Add support for fedora 40 and ubuntu noble

2 weeks ago, Gary Kramlich
eb3d46d5298c
Parents 6bcf4347ed9b
Children 79b9d58fd6d3
Add support for fedora 40 and ubuntu noble

Also remove ubuntu mantic and fedora 38
5 files changed, 59 insertions(+), 59 deletions(-)
  • +0 -19
    Dockerfile.fedora-38-amd64
  • +19 -0
    Dockerfile.fedora-40-amd64
  • +0 -34
    Dockerfile.ubuntu-mantic-amd64
  • +34 -0
    Dockerfile.ubuntu-noble-amd64
  • +6 -6
    convey.yml
    • --- a/Dockerfile.fedora-38-amd64 Thu Nov 16 04:15:08 2023 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,19 +0,0 @@
    -FROM docker.io/fedora:38
    -
    -ENV TARGET=fedora-38-amd64
    -
    -RUN set -ex && \
    - dnf update -y && \
    - dnf install -y \
    - meson ninja-build gcc mercurial git \
    - help2man libxslt gettext \
    - glib2-devel gobject-introspection-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
    -
    -CMD ["/build.sh"]
    -
    -COPY meson/build.sh /build.sh
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-40-amd64 Thu Apr 25 19:13:52 2024 -0500
    @@ -0,0 +1,19 @@
    +FROM docker.io/fedora:40
    +
    +ENV TARGET=fedora-40-amd64
    +
    +RUN set -ex && \
    + dnf update -y && \
    + dnf install -y \
    + meson ninja-build gcc mercurial git \
    + help2man libxslt gettext \
    + glib2-devel gobject-introspection-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
    +
    +CMD ["/build.sh"]
    +
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.ubuntu-mantic-amd64 Thu Nov 16 04:15:08 2023 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,34 +0,0 @@
    -FROM docker.io/ubuntu:mantic
    -
    -ENV TARGET=ubuntu-mantic-amd64
    -
    -COPY ubuntu/tzdata.selections /
    -
    -RUN set -ex && \
    - debconf-set-selections -v /tzdata.selections && \
    - ln -nsf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
    - apt update && \
    - apt install -y --no-install-recommends tzdata && \
    - apt clean && \
    - rm -rf /var/lib/apt/lists
    -
    -RUN set -ex && \
    - apt update && \
    - apt install -y --no-install-recommends \
    - ca-certificates unzip \
    - build-essential meson gettext help2man mercurial git \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - libgtk-4-dev \
    - python3-dev python-gi-dev python3-gi \
    - python3-jinja2 python3-packaging python3-pygments python3-toml \
    - python3-typogrify \
    - liblua5.3-dev lua-lgi luarocks \
    - valac \
    - && \
    - apt clean && \
    - rm -rf /var/lib/apt/lists
    -
    -CMD ["/build.sh"]
    -
    -COPY meson/build.sh /build.sh
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.ubuntu-noble-amd64 Thu Apr 25 19:13:52 2024 -0500
    @@ -0,0 +1,34 @@
    +FROM docker.io/ubuntu:noble
    +
    +ENV TARGET=ubuntu-noble-amd64
    +
    +COPY ubuntu/tzdata.selections /
    +
    +RUN set -ex && \
    + debconf-set-selections -v /tzdata.selections && \
    + ln -nsf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
    + apt update && \
    + apt install -y --no-install-recommends tzdata && \
    + apt clean && \
    + rm -rf /var/lib/apt/lists
    +
    +RUN set -ex && \
    + apt update && \
    + apt install -y --no-install-recommends \
    + ca-certificates unzip \
    + build-essential meson gettext help2man mercurial git \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-4-dev \
    + python3-dev python-gi-dev python3-gi \
    + python3-jinja2 python3-packaging python3-pygments python3-toml \
    + python3-typogrify \
    + liblua5.3-dev lua-lgi luarocks \
    + valac \
    + && \
    + apt clean && \
    + rm -rf /var/lib/apt/lists
    +
    +CMD ["/build.sh"]
    +
    +COPY meson/build.sh /build.sh
    +
    --- a/convey.yml Thu Nov 16 04:15:08 2023 -0600
    +++ b/convey.yml Thu Apr 25 19:13:52 2024 -0500
    @@ -95,13 +95,13 @@
    stages:
    - tasks: [import, build]
    - fedora-38-amd64:
    - environment: [TARGET=fedora-38-amd64]
    + fedora-39-amd64:
    + environment: [TARGET=fedora-39-amd64]
    stages:
    - tasks: [import, build]
    - fedora-39-amd64:
    - environment: [TARGET=fedora-39-amd64]
    + fedora-40-amd64:
    + environment: [TARGET=fedora-40-amd64]
    stages:
    - tasks: [import, build]
    @@ -125,8 +125,8 @@
    stages:
    - tasks: [import, build]
    - ubuntu-mantic-amd64:
    - environment: [TARGET=ubuntu-mantic-amd64]
    + ubuntu-noble-amd64:
    + environment: [TARGET=ubuntu-noble-amd64]
    stages:
    - tasks: [import, build]