From 4a38f525dd75b5f9db0dddaaf1eb1ab05c953c36 Mon Sep 17 00:00:00 2001 From: Gary Kramlich Date: Fri, 1 Oct 2021 00:51:03 -0500 Subject: Add a docs plan to convey and clean up the other plans Testing Done: Ran all plans locally and verified everything was exported properly. Reviewed at https://reviews.imfreedom.org/r/966/ --- convey.yaml | 93 +++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 34 deletions(-) (limited to 'convey.yaml') diff --git a/convey.yaml b/convey.yaml index 6e709ef8a0..eabab39f07 100644 --- a/convey.yaml +++ b/convey.yaml @@ -1,9 +1,9 @@ +--- environment: - - PACKAGECLOUD_REPO=experimental - - ARCH=amd64 - BUILD_NUMBER - - REGISTRY_HOST=docker.io - REPOSITORY=pidgin/builders + - REGISTRY=docker.io + - DOCS_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-bookworm-amd64 tasks: import: @@ -12,26 +12,47 @@ tasks: build: type: docker/run - image: ${REGISTRY_HOST}/${REPOSITORY}:${DISTRO}-${VERSION}-${ARCH} + image: ${REGISTRY}/${REPOSITORY}:${TARGET} clean: type: convey/clean files: - appimage-x86_64 - - pvs-studio + - clang + - debian-bullseye-amd64 + - debian-bookworm-amd64 + - fedora-34-amd64 - scanbuild + - ubuntu-hirsute-amd64 - export: - type: docker/export - files: ${DISTRO}-${VERSION}-${ARCH} + docs-clean: + type: convey/clean + files: + - facebook3-docs + - finch3-docs + - pidgin3-docs + - purple3-docs - build-target: + docs-build: type: docker/run - image: ${REGISTRY_HOST}/${REPOSITORY}:${TARGET} + image: ${DOCS_BUILD_IMAGE} + workdir: ${CONVEY_WORKSPACE} + script: + - set -ex + - meson -Ddoc=true build-docs + - ninja -C build-docs doc - export-target: + docs-export: type: docker/export - files: ${TARGET} + files: + - build-docs/doc/reference/finch/html/:finch3-docs + - build-docs/doc/reference/libpurple/html/:purple3-docs + - build-docs/doc/reference/pidgin/html/:pidgin3-docs + - build-docs/doc/reference/protocols/facebook/html/:facebook3-docs + + export: + type: docker/export + files: build-${TARGET}:${TARGET} plans: pidgin3-appimage-x86_64: @@ -43,50 +64,54 @@ plans: - RECIPE=Pidgin3 - CONFIGURE_ARGS=-Dconsoleui=False stages: - - tasks: [import, build-target, export-target] + - tasks: [import, build, export] clang: environment: [TARGET=clang] stages: - - tasks: [import, build-target] + - tasks: [import, build] + - tasks: [export] + run: always clean: stages: - - tasks: [clean] + - tasks: [clean, docs-clean] - debian: + debian-bullseye-amd64: environment: [TARGET=debian-bullseye-amd64] stages: - - tasks: [import, build-target] + - tasks: [import, build] + - tasks: [export] + run: always - fedora: - environment: [TARGET=fedora-34-amd64] + debian-bookworm-amd64: + environment: [TARGET=debian-bookworm-amd64] stages: - - tasks: [import, build-target] + - tasks: [import, build] + - tasks: [export] + run: always - mingw-w64-x86_64: - environment: [DISTRO=mingw, VERSION=w64, ARCH=x86_64] + docs: stages: - - tasks: [import, build] + - tasks: [docs-clean, import, docs-build, docs-export] - pvs-studio: - environment: - - TARGET=pvs-studio - - PVS_STUDIO_USERNAME - - PVS_STUDIO_KEY + fedora-34-amd64: + environment: [TARGET=fedora-34-amd64] stages: - - tasks: [import, build-target] - - tasks: [export-target] + - tasks: [import, build] + - tasks: [export] run: always scanbuild: environment: [TARGET=scanbuild] stages: - - tasks: [import, build-target] - - tasks: [export-target] + - tasks: [import, build] + - tasks: [export] run: always - ubuntu: + ubuntu-hirsute-amd64: environment: [TARGET=ubuntu-hirsute-amd64] stages: - - tasks: [import, build-target] + - tasks: [import, build] + - tasks: [export] + run: always -- cgit v1.2.1