gplugin/builders

Remove debian-buster and elementary-juno as we can't target them due to our dependencies

2020-02-25, Gary Kramlich
cb21030f9f67
Parents 347df29327da
Children 100e8475fa6d
Remove debian-buster and elementary-juno as we can't target them due to our dependencies
3 files changed, 6 insertions(+), 103 deletions(-)
  • +0 -38
    Dockerfile.debian-buster-amd64
  • +0 -50
    Dockerfile.elementary-juno-amd64
  • +6 -15
    convey.yml
    • --- a/Dockerfile.debian-buster-amd64 Mon Feb 24 23:44:09 2020 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,38 +0,0 @@
    -FROM debian:buster
    -
    -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 \
    - build-essential meson gettext help2man 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=buster \
    - ARCH=amd64
    -
    -COPY debian/build.sh /build.sh
    -
    --- a/Dockerfile.elementary-juno-amd64 Mon Feb 24 23:44:09 2020 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,50 +0,0 @@
    -FROM elementary/docker:juno-unstable
    -
    -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 dist-upgrade -y && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson 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=elemtary \
    - VERSION=juno \
    - ARCH=amd64
    -
    -COPY debian/build.sh /build.sh
    -
    --- a/convey.yml Mon Feb 24 23:44:09 2020 -0600
    +++ b/convey.yml Tue Feb 25 00:11:27 2020 -0600
    @@ -64,11 +64,6 @@
    stages:
    - tasks: [import, build]
    - debian-buster-amd64:
    - environment: [TARGET=debian-buster-amd64]
    - stages:
    - - tasks: [import, build]
    -
    debian-bullseye-amd64:
    environment: [TARGET=debian-bullseye-amd64]
    stages:
    @@ -89,11 +84,6 @@
    stages:
    - tasks: [import, build]
    - elementary-juno-amd64:
    - environment: [TARGET=elementary-juno-amd64]
    - stages:
    - - tasks: [import, build]
    -
    fedora-30-amd64:
    environment: [TARGET=fedora-30-amd64]
    stages:
    @@ -158,15 +148,12 @@
    all:
    plans:
    - alpine-edge-amd64
    - - debian-buster-amd64
    + - clang-format
    - debian-bullseye-amd64
    - - debian-bullseye-arm64
    - - debian-bullseye-armhf
    - dist
    - - elementary-juno-amd64
    - - fedora-29-amd64
    - fedora-30-amd64
    - fedora-31-amd64
    + - fedora-32-amd64
    - fedora-rawhide-amd64
    - mingw-w64-i686
    - mingw-w64-x86_64
    @@ -176,4 +163,8 @@
    - simple
    - ubuntu-focal-amd64
    - valgrind
    + qemu-user-static:
    + plans:
    + - debian-bullseye-arm64
    + - debian-bullseye-armhf