--- a/convey.yml Sun Oct 10 00:28:54 2021 -0500
+++ b/convey.yml Mon Oct 11 21:22:46 2021 -0500
@@ -1,25 +1,14 @@
- - PACKAGECLOUD_REPO=pidgin/experimental
- REGISTRY_HOST=docker.io
- - REPOSITORY=talkatu/builders
+ - REPOSITORY=docker.io/talkatu/builders + - DOCS_BUILD_IMAGE=docker.io/talkatu/builders:debian-bullseye-amd64
- server: ${REGISTRY_HOST}
- username: ${REGISTRY_USERNAME}
- password: ${REGISTRY_PASSWORD}
- server: ${REGISTRY_HOST}
@@ -30,193 +19,79 @@
- image: ${REGISTRY_HOST}/${REPOSITORY}:${DISTRO}-${VERSION}-${ARCH}
+ image: ${REGISTRY_HOST}/${REPOSITORY}:${TARGET} - files: ${DISTRO}-${VERSION}-${ARCH}
- image: ${REGISTRY_HOST}/${REPOSITORY}:${TARGET}
- image: talkatu/builders:debian-buster-amd64
+ image: ${DOCS_BUILD_IMAGE} + workdir: ${CONVEY_WORKSPACE} - - cd ${CONVEY_WORKSPACE}
- ninja -C build-docs talkatu-doc
- dockerfile: talkatu/reference/Dockerfile
- tag: talkatu/docs:${DOCS_VERSION}
- - build-docs/talkatu/reference/html:.
- image: talkatu/docs:${DOCS_VERSION}
- image: rwgrim/package_cloud:latest
- environment: [PACKAGECLOUD_TOKEN]
- command: push --yes --verbose ${PACKAGECLOUD_REPO}/${DISTRO}/${VERSION} ${PATTERN}
- workdir: ${CONVEY_WORKSPACE}/${DISTRO}-${VERSION}-${ARCH}
- - ${DISTRO}-${VERSION}-${ARCH}
+ files: build-docs/talkatu/reference/html:talkatu-docs - environment: [DISTRO=debian, VERSION=bullseye]
+ environment: TARGET=debian-bullseye-amd64 - tasks: [import, build, export]
- environment: [DISTRO=debian, VERSION=buster]
+ environment: TARGET=debian-buster-amd64 - tasks: [import, build, export]
- environment: [DISTRO=debian, VERSION=buster, ARCH=i386]
+ environment: TARGET=debian-buster-i386 - tasks: [import, build, export]
+ - tasks: [docs-clean, import, docs-build, docs-export] - environment: [DISTRO=fedora, VERSION=31]
+ environment: TARGET=fedora-31-amd64 - tasks: [import, build, export]
- environment: [DISTRO=fedora, VERSION=32]
+ environment: TARGET=fedora-32-amd64 - tasks: [import, build, export]
- environment: [DISTRO=fedora, VERSION=33]
+ environment: TARGET=fedora-33-amd64 - tasks: [import, build, export]
- environment: [DISTRO=fedora, VERSION=rawhide]
- - 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]
+ environment: TARGET=fedora-rawhide-amd64 - tasks: [import, build, export]
- - PVS_IGNORED_CODES=V568
+ environment: TARGET=scanbuild - - tasks: [import, build-target]
- - tasks: [export-target]
- environment: [TARGET=scanbuild]
- - tasks: [import, build-target]
- - tasks: [export-target]
+ - tasks: [import, build] - environment: [TARGET=valgrind]
- - tasks: [import, build-target, export-target]
+ environment: TARGET=valgrind
- - name: publish-fedora-29
- - name: publish-fedora-30
- - name: publish-fedora-31
+ - tasks: [import, build, export]