--- a/convey.yml Mon Oct 07 06:01:26 2019 -0500
+++ b/convey.yml Mon Oct 07 06:40:03 2019 -0500
@@ -1,8 +1,10 @@
- - PACKAGECLOUD_REPO=experimental
+ - PACKAGECLOUD_REPO=pidgin/experimental + - REGISTRY_HOST=docker.io + - REPOSITORY=talkatu/builders @@ -11,43 +13,43 @@
- username: ${DOCKERHUB_USERNAME}
- password: ${DOCKERHUB_PASSWORD}
+ server: ${REGISTRY_HOST} + username: ${REGISTRY_USERNAME} + password: ${REGISTRY_PASSWORD}
+ server: ${REGISTRY_HOST} + - debian-bullseye-amd64 - image: talkatu/builders:${DISTRO}-${VERSION}-${ARCH}
+ image: ${REGISTRY_HOST}/${REPOSITORY}:${DISTRO}-${VERSION}-${ARCH} files: ${DISTRO}-${VERSION}-${ARCH}
- image: talkatu/builders:${TARGET}
+ image: ${REGISTRY_HOST}/${REPOSITORY}:${TARGET}
- image: talkatu/builders:scanbuild
image: talkatu/builders:debian-buster-amd64
@@ -68,9 +70,8 @@
image: rwgrim/package_cloud:latest
- command: push --yes --verbose pidgin/${PACKAGECLOUD_REPO}/${DISTRO}/${VERSION} ${PATTERN}
+ environment: [PACKAGECLOUD_TOKEN] + command: push --yes --verbose ${PACKAGECLOUD_REPO}/${DISTRO}/${VERSION} ${PATTERN} workdir: ${CONVEY_WORKSPACE}/${DISTRO}-${VERSION}-${ARCH}
@@ -78,11 +79,13 @@
@@ -95,15 +98,20 @@
- ${DISTRO}-${VERSION}-${ARCH}
+ environment: [DISTRO=debian, VERSION=bullseye]
+ - tasks: [import, build, export] + environment: [DISTRO=debian, VERSION=buster] + - tasks: [import, build, export] + environment: [DISTRO=debian, VERSION=buster, ARCH=i386] + - tasks: [import, build, export] @@ -128,35 +136,39 @@
+ environment: [DISTRO=fedora, VERSION=29] + - tasks: [import, build, export] + environment: [DISTRO=fedora, VERSION=30]
- tasks: [import, build, export]
- tasks: [import, build, export]
+ - tasks: [import, build, export] + environment: [DISTRO=mingw, VERSION=w64, ARCH=i686, FILES=mingw] + - tasks: [import, build, export] + environment: [DISTRO=mingw, VERSION=w64, ARCH=x86_64, FILES=mingw] + - tasks: [import, build, export]
+ environment: [TARGET=pvs-studio, PVS_STUDIO_USERNAME, PVS_STUDIO_KEY] - tasks: [import, build-target]
+ environment: [TARGET=scanbuild] - - tasks: [import, scanbuild, scanbuild-export]
+ - tasks: [import, build-target] + - tasks: [export-target] environment: [TARGET=valgrind]
@@ -193,10 +205,3 @@