gplugin/builders

Overhaul convey.yml to remove the triplet setup and just use TARGET instead. Also remove the need for the FILES variable as it wasn't really necessary.

2019-11-01, Gary Kramlich
e0c57cc6e014
Parents db671c290359
Children 96857564c81e
Overhaul convey.yml to remove the triplet setup and just use TARGET instead. Also remove the need for the FILES variable as it wasn't really necessary.
1 files changed, 58 insertions(+), 67 deletions(-)
  • +58 -67
    convey.yml
    • --- a/convey.yml Fri Nov 01 20:10:47 2019 -0500
    +++ b/convey.yml Fri Nov 01 21:51:02 2019 -0500
    @@ -1,5 +1,4 @@
    environment:
    - - ARCH=amd64
    - REPO=gplugin/builders
    - REGISTRY=docker.io
    - REGISTRY_USERNAME
    @@ -15,38 +14,18 @@
    type: docker/remove
    quiet: true
    images:
    - - ${REGISTRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    + - ${REGISTRY}/${REPO}:${TARGET}
    build:
    type: docker/build
    - dockerfile: Dockerfile.${DISTRO}-${VERSION}-${ARCH}
    - tag: ${REGISTRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    - files:
    - - ${FILES}
    + dockerfile: Dockerfile.${TARGET}
    + tag: ${REGISTRY}/${REPO}:${TARGET}
    + files: .:.
    labels:
    - COMMIT=${HG_COMMIT}
    publish:
    type: docker/push
    - image: ${REGISTRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    -
    - clean-target:
    - type: docker/remove
    - quiet: true
    - images:
    - - ${REGISTRY}/${REPO}:${TARGET}
    -
    - build-target:
    - type: docker/build
    - dockerfile: Dockerfile.${TARGET}
    - tags: ${REGISTRY}/${REPO}:${TARGET}
    - files:
    - - ${FILES}
    - labels:
    - - COMMIT=${HG_COMMIT}
    -
    - publish-target:
    - type: docker/push
    image: ${REGISTRY}/${REPO}:${TARGET}
    login:
    @@ -75,127 +54,139 @@
    - tasks: [logout]
    run: always
    - clean-target:
    - stages:
    - - tasks: [clean-target]
    -
    - build-target:
    - stages:
    - - tasks: [import, build-target]
    -
    - publish-target:
    - stages:
    - - tasks: [login, publish-target]
    - - tasks: [logout]
    - run: always
    -
    alpine-edge-amd64:
    - environment: [DISTRO=alpine, VERSION=edge, FILES=alpine]
    + environment: [TARGET=alpine-edge-amd64]
    stages:
    - tasks: [import, build]
    debian-buster-amd64:
    - environment: [DISTRO=debian, VERSION=buster, FILES=debian]
    + environment: [TARGET=debian-buster-amd64]
    stages:
    - tasks: [import, build]
    debian-buster-arm64:
    - environment: [DISTRO=debian, VERSION=buster, ARCH=arm64, FILES=debian]
    + environment: [TARGET=debian-buster-arm64]
    stages:
    - tasks: [import, build]
    debian-buster-armhf:
    - environment: [DISTRO=debian, VERSION=buster, ARCH=armhf, FILES=debian]
    + environment: [TARGET=debian-buster-armhf]
    stages:
    - tasks: [import, build]
    debian-bullseye-amd64:
    - environment: [DISTRO=debian, VERSION=buster, FILES=debian]
    + environment: [TARGET=debian-bullseye-amd64]
    stages:
    - tasks: [import, build]
    dist:
    - environment: [TARGET=dist, FILES=dist]
    + environment: [TARGET=dist]
    stages:
    - - tasks: [import, build-target]
    + - tasks: [import, build]
    docs:
    - environment: [TARGET=docs, FILES=docs]
    + environment: [TARGET=docs]
    stages:
    - - tasks: [import, build-target]
    + - tasks: [import, build]
    elementary-juno-amd64:
    - environment: [DISTRO=elementary, VERSION=juno, FILES=debian]
    + environment: [TARGET=elementary-juno-amd64]
    stages:
    - tasks: [import, build]
    fedora-29-amd64:
    - environment: [DISTRO=fedora, VERSION=29, FILES=rpm]
    + environment: [TARGET=fedora-29-amd64]
    stages:
    - tasks: [import, build]
    fedora-30-amd64:
    - environment: [DISTRO=fedora, VERSION=30, FILES=rpm]
    + environment: [TARGET=fedora-30-amd64]
    stages:
    - tasks: [import, build]
    fedora-31-amd64:
    - environment: [DISTRO=fedora, VERSION=31, FILES=rpm]
    + environment: [TARGET=fedora-31-amd64]
    stages:
    - tasks: [import, build]
    fedora-rawhide-amd64:
    - environment: [DISTRO=fedora, VERSION=rawhide, FILES=rpm]
    + environment: [TARGET=fedora-rawhide-amd64]
    stages:
    - tasks: [import, build]
    mingw-w64-i686:
    - environment: [DISTRO=mingw, VERSION=w64, ARCH=i686, FILES=mingw]
    + environment: [TARGET=mingw-w64-i686]
    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]
    opensuse-tumbleweed-amd64:
    - environment: [DISTRO=opensuse, VERSION=tumbleweed, FILES=rpm]
    + environment: [TARGET=opensuse-tumbleweed-amd64]
    stages:
    - tasks: [import, build]
    pvs-studio:
    - environment: [TARGET=pvs-studio, FILES=pvs-studio]
    + environment: [TARGET=pvs-studio]
    stages:
    - - tasks: [import, build-target]
    + - tasks: [import, build]
    scanbuild:
    - environment: [TARGET=scanbuild, FILES=scanbuild]
    + environment: [TARGET=scanbuild]
    stages:
    - - tasks: [import, build-target]
    + - tasks: [import, build]
    simple:
    - environment: [TARGET=simple, FILES=simple]
    + environment: [TARGET=simple]
    stages:
    - - tasks: [import, build-target]
    + - tasks: [import, build]
    ubuntu-bionic-amd64:
    - environment: [DISTRO=ubuntu, VERSION=bionic, FILES=debian]
    + environment: [TARGET=ubuntu-bionic-amd64]
    stages:
    - tasks: [import, build]
    ubuntu-cosmic-amd64:
    - environment: [DISTRO=ubuntu, VERSION=cosmic, FILES=debian]
    + environment: [TARGET=ubuntu-cosmic-amd64]
    stages:
    - tasks: [import, build]
    ubuntu-disco-amd64:
    - environment: [DISTRO=ubuntu, VERSION=disco, FILES=debian]
    + environment: [TARGET=ubuntu-disco-amd64]
    stages:
    - tasks: [import, build]
    valgrind:
    - environment: [TARGET=valgrind, FILES=valgrind]
    + environment: [TARGET=valgrind]
    stages:
    - - tasks: [import, build-target]
    + - tasks: [import, build]
    +meta-plans:
    + all:
    + plans:
    + - alpine-edge-amd64
    + - debian-buster-amd64
    + - debian-buster-arm64
    + - debian-buster-armhf
    + - debian-bullseye-amd64
    + - dist
    + - docs
    + - elementary-juno-amd64
    + - fedora-29-amd64
    + - fedora-30-amd64
    + - fedora-31-amd64
    + - fedora-rawhide-amd64
    + - mingw-w64-i686
    + - mingw-w64-x86_64
    + - opensuse-tumbleweed-amd64
    + - pvs-studio
    + - scanbuild
    + - simple
    + - ubuntu-bionic-amd64
    + - ubuntu-cosmic-amd64
    + - ubuntu-disco-amd64
    + - valgrind
    +