gplugin/builders

Override the output path for debian packages and update everything for it

2018-12-04, Gary Kramlich
bfadd4ce791d
Parents ee7d90cf3c4c
Children 91ea54f72f52
Override the output path for debian packages and update everything for it
5 files changed, 19 insertions(+), 21 deletions(-)
  • +2 -1
    Dockerfile.debian-buster-amd64
  • +2 -1
    Dockerfile.debian-stretch-amd64
  • +2 -1
    Dockerfile.ubuntu-bionic-amd64
  • +10 -3
    Dockerfile.ubuntu-xenial-amd64
  • +3 -15
    debian/build.sh
    • --- a/Dockerfile.debian-buster-amd64 Mon Dec 03 23:31:15 2018 -0600
    +++ b/Dockerfile.debian-buster-amd64 Tue Dec 04 22:48:13 2018 -0600
    @@ -29,7 +29,8 @@
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=buster \
    +ENV DISTRO=debian \
    + VERSION=buster \
    ARCH=amd64
    COPY debian/build.sh /build.sh
    --- a/Dockerfile.debian-stretch-amd64 Mon Dec 03 23:31:15 2018 -0600
    +++ b/Dockerfile.debian-stretch-amd64 Tue Dec 04 22:48:13 2018 -0600
    @@ -30,7 +30,8 @@
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=stretch \
    +ENV DISTRO=debian \
    + VERSION=stretch \
    ARCH=amd64
    COPY debian/build.sh /build.sh
    --- a/Dockerfile.ubuntu-bionic-amd64 Mon Dec 03 23:31:15 2018 -0600
    +++ b/Dockerfile.ubuntu-bionic-amd64 Tue Dec 04 22:48:13 2018 -0600
    @@ -29,7 +29,8 @@
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=bionic \
    +ENV DISTRO=ubuntu \
    + VERSION=bionic \
    ARCH=amd64
    COPY debian/build.sh /build.sh
    --- a/Dockerfile.ubuntu-xenial-amd64 Mon Dec 03 23:31:15 2018 -0600
    +++ b/Dockerfile.ubuntu-xenial-amd64 Tue Dec 04 22:48:13 2018 -0600
    @@ -12,11 +12,10 @@
    rm -rf /var/lib/apt/lists
    RUN set -ex && \
    - echo deb http://archive.ubuntu.com/ubuntu xenial-backports main restricted universe multiverse > /etc/apt/sources.list.d/backports.list && \
    apt-get update && \
    apt-get install -y --no-install-recommends \
    ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson/xenial-backports ninja-build gettext help2man xsltproc mercurial \
    + build-essential ninja-build gettext help2man xsltproc mercurial \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    gtk-doc-tools libgtk-3-dev libgladeui-dev \
    python3-dev python-gi-dev python3-gi \
    @@ -26,11 +25,19 @@
    rm -rf /var/lib/apt/lists
    RUN set -ex && \
    + apt-get update && \
    + apt-get install -y --no-install-recommends python3-setuptools python3-pip && \
    + pip3 install meson && \
    + apt-get clean && \
    + rm -rf /var/lib/apt/lists
    +
    +RUN set -ex && \
    luarocks install moonscript
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=xenial \
    +ENV DISTRO=ubuntu \
    + VERSION=xenial \
    ARCH=amd64
    COPY debian/build.sh /build.sh
    --- a/debian/build.sh Mon Dec 03 23:31:15 2018 -0600
    +++ b/debian/build.sh Tue Dec 04 22:48:13 2018 -0600
    @@ -1,5 +1,5 @@
    #!/bin/sh -ex
    -# Copyright (C) 2015-2017 Gary Kramlich <grim@reaperworld.com>
    +# Copyright (C) 2015-2018 Gary Kramlich <grim@reaperworld.com>
    #
    # This program is free software; you can redistribute it and/or modify
    # it under the terms of the GNU General Public License as published by
    @@ -17,7 +17,7 @@
    cd "${CONVEY_WORKSPACE}"
    -ARTIFACTS_DIR=${CONVEY_WORKSPACE}/debian-${DISTRIBUTION}-${ARCH}
    +export ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${DISTRO}-${VERSION}-${ARCH}
    mkdir -p "${ARTIFACTS_DIR}"
    cp -a "${CONVEY_WORKSPACE}"/packaging/debian debian
    @@ -27,18 +27,6 @@
    BUILD_VERSION="${BUILD_NUMBER}~${HG_ID}"
    VERSION=$(dpkg-parsechangelog --show-field Version)
    dch -D "${DISTRIBUTION}" -v "${VERSION}.${BUILD_VERSION}" "build for ${HG_ID}"
    -debuild -us -uc
    +debuild --preserve-envvar=ARTIFACTS_DIR -us -uc --buildinfo-option=-u"${ARTIFACTS_DIR}" --changes-option=-u"${ARTIFACTS_DIR}"
    find . -name "*-junit.xml" -exec cp {} "${ARTIFACTS_DIR}" \;
    -
    -# shellcheck disable=SC2103
    -cd ..
    -
    -DEBS_DIR="${ARTIFACTS_DIR}/debs"
    -mkdir -p "${DEBS_DIR}"
    -cp ./*.changes "${DEBS_DIR}"
    -LINE_NO=$(grep -n Files: ./*.changes | cut -d: -f1)
    -for FILENAME in $(cat ./*.changes | tail -n +"${LINE_NO}" | awk '{print $5}'); do
    - mv "${FILENAME}" "${DEBS_DIR}"
    -done
    -