pidgin/builders

Fix the debian builds, move to a target only convey.yml, and add a clean plan

2019-11-03, Gary Kramlich
761eb50a7724
Parents 34fcdd1ed935
Children 4c052739aca2
Fix the debian builds, move to a target only convey.yml, and add a clean plan
3 files changed, 28 insertions(+), 44 deletions(-)
  • +3 -2
    Dockerfile.debian-bullseye-amd64
  • +3 -2
    Dockerfile.debian-buster-amd64
  • +22 -40
    convey.yml
    • --- a/Dockerfile.debian-bullseye-amd64 Thu Oct 10 23:21:22 2019 -0500
    +++ b/Dockerfile.debian-bullseye-amd64 Sun Nov 03 18:49:33 2019 -0600
    @@ -16,7 +16,7 @@
    libavahi-glib-dev libavahi-client-dev \
    libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - help2man xvfb \
    + help2man xvfb xauth \
    gtk-doc-tools \
    libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    @@ -26,8 +26,9 @@
    libxss-dev \
    libncurses5-dev \
    libgadu-dev \
    - libqt4-dev kdelibs5-dev \
    libsecret-1-dev \
    + cmake \
    + qt5-default libkf5wallet-dev \
    libsoup2.4-dev \
    && \
    apt-get clean && \
    --- a/Dockerfile.debian-buster-amd64 Thu Oct 10 23:21:22 2019 -0500
    +++ b/Dockerfile.debian-buster-amd64 Sun Nov 03 18:49:33 2019 -0600
    @@ -16,7 +16,7 @@
    libavahi-glib-dev libavahi-client-dev \
    libjson-glib-dev libdbus-glib-1-dev libgmime-3.0-dev \
    libgladeui-dev libgspell-1-dev libgumbo-dev libcmark-dev \
    - help2man xvfb \
    + help2man xvfb xauth \
    gtk-doc-tools \
    libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
    gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
    @@ -26,8 +26,9 @@
    libxss-dev \
    libncurses5-dev \
    libgadu-dev \
    - libqt4-dev kdelibs5-dev \
    libsecret-1-dev \
    + cmake \
    + qt5-default libkf5wallet-dev \
    libsoup2.4-dev \
    && \
    apt-get clean && \
    --- a/convey.yml Thu Oct 10 23:21:22 2019 -0500
    +++ b/convey.yml Sun Nov 03 18:49:33 2019 -0600
    @@ -1,71 +1,60 @@
    environment:
    - - ARCH=amd64
    - REPO=pidgin/builders
    - REGISTRY_USERNAME
    - REGISTRY_PASSWORD
    - - REGISTRY_HOST=docker.io
    + - REGISTRY=docker.io
    tasks:
    import:
    type: docker/import
    - files:
    - - .:.
    + files: .:.
    build:
    type: docker/build
    - dockerfile: Dockerfile.${DISTRO}-${VERSION}-${ARCH}
    - tag: ${REGISTRY_HOST}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    - files:
    - - ${FILES}
    - labels:
    - - COMMIT=${HG_COMMIT}
    -
    - build-target:
    - type: docker/build
    dockerfile: Dockerfile.${TARGET}
    - tag: ${REGISTRY_HOST}/${REPO}:${TARGET}
    - files:
    - - ${FILES}
    + tag: ${REGISTRY}/${REPO}:${TARGET}
    + files: .:.
    labels:
    - COMMIT=${HG_COMMIT}
    publish:
    type: docker/push
    - image: ${REGISTRY_HOST}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    -
    - publish-target:
    - type: docker/push
    - image: ${REGISTRY_HOST}/${REPO}:${TARGET}
    + image: ${REGISTRY}/${REPO}:${TARGET}
    login:
    type: docker/login
    username: ${REGISTRY_USERNAME}
    password: ${REGISTRY_PASSWORD}
    - server: ${REGISTRY_HOST}
    + server: ${REGISTRY}
    logout:
    type: docker/logout
    - server: ${REGISTRY_HOST}
    + server: ${REGISTRY}
    +
    + clean:
    + type: docker/remove
    + quiet: true
    + images: ${REGISTRY}/${REPO}:${TARGET}
    plans:
    debian-bullseye-amd64:
    - environment: [DISTRO=debian, VERSION=bullseye, FILES=simple]
    + environment: TARGET=debian-bullseye-amd64
    stages:
    - tasks: [import, build]
    debian-buster-amd64:
    - environment: [DISTRO=debian, VERSION=buster, FILES=simple]
    + environment: TARGET=debian-buster-amd64
    stages:
    - tasks: [import, build]
    mingw-w64-x86_64:
    - environment: [DISTRO=mingw, VERSION=w64, ARCH=x86_64, FILES=mingw]
    + environment: TARGET=mingw-w64-x86_64
    stages:
    - tasks: [import, build]
    subproject-build:
    - environment: [TARGET=subproject-build, FILES=simple]
    + environment: TARGET=subproject-build
    stages:
    - - tasks: [import, build-target]
    + - tasks: [import, build]
    build:
    stages:
    @@ -78,19 +67,12 @@
    - tasks: [logout]
    run: always
    - build-target:
    - stages:
    - - tasks: [import, build-target]
    -
    - publish-target:
    - environment: [REGISTRY_USERNAME, REGISTRY_PASSWORD]
    + pvs-studio:
    + environment: TARGET=pvs-studio
    stages:
    - - tasks: [login, publish-target]
    - - tasks: [logout]
    - run: always
    + - tasks: [import, build]
    - pvs-studio:
    - environment: [TARGET=pvs-studio, FILES=pvs-studio]
    + clean:
    stages:
    - - tasks: [import, build-target]
    + - tasks: clean