gplugin/builders

Replace ubuntu hirsute with ubuntu jammy

2021-12-27, Gary Kramlich
493a9229a558
Parents f16a32a0f707
Children 2389f8b9564e
Replace ubuntu hirsute with ubuntu jammy
3 files changed, 39 insertions(+), 39 deletions(-)
  • +0 -36
    Dockerfile.ubuntu-hirsute-amd64
  • +36 -0
    Dockerfile.ubuntu-jammy-amd64
  • +3 -3
    convey.yml
    • --- a/Dockerfile.ubuntu-hirsute-amd64 Mon Oct 04 02:06:53 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,36 +0,0 @@
    -FROM ubuntu:hirsute
    -
    -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 git \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - libgtk-3-dev libgtk-4-dev \
    - python3-dev python-gi-dev python3-gi \
    - python3-jinja2 python3-pygments python3-toml python3-typogrify \
    - 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 TARGET=ubuntu-hirsute-amd64
    -
    -COPY debian/build.sh /build.sh
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.ubuntu-jammy-amd64 Mon Dec 27 04:15:41 2021 -0600
    @@ -0,0 +1,36 @@
    +FROM ubuntu:jammy
    +
    +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 git \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-3-dev libgtk-4-dev \
    + python3-dev python-gi-dev python3-gi \
    + python3-jinja2 python3-pygments python3-toml python3-typogrify \
    + 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 TARGET=ubuntu-hirsute-amd64
    +
    +COPY debian/build.sh /build.sh
    +
    --- a/convey.yml Mon Oct 04 02:06:53 2021 -0500
    +++ b/convey.yml Mon Dec 27 04:15:41 2021 -0600
    @@ -115,8 +115,8 @@
    stages:
    - tasks: [import, build]
    - ubuntu-hirsute-amd64:
    - environment: [TARGET=ubuntu-hirsute-amd64]
    + ubuntu-jammy-amd64:
    + environment: [TARGET=ubuntu-jammy-amd64]
    stages:
    - tasks: [import, build]
    @@ -141,7 +141,7 @@
    - opensuse-tumbleweed-amd64
    - scanbuild
    - simple
    - - ubuntu-hirsute-amd64
    + - ubuntu-jammy-amd64
    - valgrind
    qemu-user-static:
    plans: