gplugin/builders

Replace ubuntu-bionic and ubuntu-eoan with ubuntu-focal

2020-02-24, Gary Kramlich
347df29327da
Parents 45c49bfa0824
Children cb21030f9f67
Replace ubuntu-bionic and ubuntu-eoan with ubuntu-focal
4 files changed, 49 insertions(+), 115 deletions(-)
  • +0 -49
    Dockerfile.ubuntu-bionic-amd64
  • +0 -57
    Dockerfile.ubuntu-eoan-amd64
  • +46 -0
    Dockerfile.ubuntu-focal-amd64
  • +3 -9
    convey.yml
    • --- a/Dockerfile.ubuntu-bionic-amd64 Mon Feb 24 23:36:34 2020 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,49 +0,0 @@
    -FROM ubuntu:bionic
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    -COPY debian/localepurge.selections /
    -
    -RUN set -ex && \
    - debconf-set-selections -v /localepurge.selections && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends localepurge && \
    - 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 ninja-build gettext help2man xsltproc \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - gtk-doc-tools libgtk-3-dev \
    - python3-dev python-gi-dev python3-gi \
    - liblua5.1-0-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
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - python libpython-dev python-pip python-setuptools \
    - && \
    - pip install mercurial && \
    - apt-get remove -y --purge libpython-dev python-pip python-setuptools && \
    - apt-get autoremove -y --purge && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -CMD ["/build.sh"]
    -
    -ENV DISTRO=ubuntu \
    - VERSION=bionic \
    - ARCH=amd64
    -
    -COPY debian/build.sh /build.sh
    -
    --- a/Dockerfile.ubuntu-eoan-amd64 Mon Feb 24 23:36:34 2020 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,57 +0,0 @@
    -FROM ubuntu:eoan
    -
    -MAINTAINER Gary Kramlich <grim@reaperworld.com>
    -
    -COPY debian/localepurge.selections debian/tzdata.selections /
    -
    -RUN set -ex && \
    - debconf-set-selections -v /localepurge.selections && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends localepurge && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -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 ninja-build gettext help2man xsltproc meson \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - gtk-doc-tools libgtk-3-dev \
    - python3-dev python-gi-dev python3-gi \
    - liblua5.1-0-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
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - python libpython-dev python-pip python-setuptools \
    - && \
    - pip install mercurial && \
    - apt-get remove -y --purge libpython-dev python-pip python-setuptools && \
    - apt-get autoremove -y --purge && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -CMD ["/build.sh"]
    -
    -ENV DISTRO=ubuntu \
    - VERSION=eoan \
    - ARCH=amd64
    -
    -COPY debian/build.sh /build.sh
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.ubuntu-focal-amd64 Mon Feb 24 23:44:09 2020 -0600
    @@ -0,0 +1,46 @@
    +FROM ubuntu:focal
    +
    +MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +
    +COPY debian/localepurge.selections debian/tzdata.selections /
    +
    +RUN set -ex && \
    + debconf-set-selections -v /localepurge.selections && \
    + apt-get update && \
    + apt-get install -y --no-install-recommends localepurge && \
    + apt-get clean && \
    + rm -rf /var/lib/apt/lists
    +
    +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 \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + gtk-doc-tools libgtk-3-dev \
    + python3-dev python-gi-dev python3-gi \
    + liblua5.1-0-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 DISTRO=debian \
    + VERSION=bullseye \
    + ARCH=amd64
    +
    +COPY debian/build.sh /build.sh
    +
    --- a/convey.yml Mon Feb 24 23:36:34 2020 -0600
    +++ b/convey.yml Mon Feb 24 23:44:09 2020 -0600
    @@ -144,13 +144,8 @@
    stages:
    - tasks: [import, build]
    - ubuntu-bionic-amd64:
    - environment: [TARGET=ubuntu-bionic-amd64]
    - stages:
    - - tasks: [import, build]
    -
    - ubuntu-eoan-amd64:
    - environment: [TARGET=ubuntu-eoan-amd64]
    + ubuntu-focal-amd64:
    + environment: [TARGET=ubuntu-focal-amd64]
    stages:
    - tasks: [import, build]
    @@ -179,7 +174,6 @@
    - pvs-studio
    - scanbuild
    - simple
    - - ubuntu-disco-amd64
    - - ubuntu-eoan-amd64
    + - ubuntu-focal-amd64
    - valgrind