libgnt/libgnt
Clone
Summary
Browse
Changes
Graph
Overhaul convey.yml
release-2.x.y
2021-09-27, Gary Kramlich
cfcf6ff3913e
Parents
f61ccf9acd3f
Children
3fadbfa21320
Overhaul convey.yml
Testing Done:
Run all of the plans.
Reviewed at https://reviews.imfreedom.org/r/954/
1 files changed, 41 insertions(+), 48 deletions(-)
+41
-48
convey.yml
--- a/convey.yml Sat Sep 25 23:42:52 2021 -0500
+++ b/convey.yml Mon Sep 27 23:56:45 2021 -0500
@@ -1,69 +1,62 @@
-# vi:et:ts=2 sw=2 sts=2
environment:
- - GNT_VERSION=next
- - DOCS_TAG=libgnt/docs:${GNT_VERSION}
+ - REGISTRY=docker.io
+ - REPOSITORY=libgnt/builders
+ - DOCS_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-bookworm-amd64
tasks:
- import:
- type: docker/import
- files: .:.
-
- login:
- type: docker/login
- username: ${DOCKERHUB_USERNAME}
- password: ${DOCKERHUB_PASSWORD}
- server: docker.io
- logout:
- type: docker/logout
- server: docker.io
+ build:
+ type: docker/run
+ image: docker.io/libgnt/builders:${TARGET}
clean:
type: convey/clean
files:
- - build-convey
+ - libgnt-docs
- build-docs:
+ docs-clean:
+ type: convey/clean
+ files: libgnt-docs
+ docs-build:
type: docker/run
- image: libgnt/builders:debian-buster-amd64
+ image: ${DOCS_BUILD_IMAGE}
+ workdir: ${CONVEY_WORKSPACE}
script:
- set -ex
- - cd ${CONVEY_WORKSPACE}
- - meson build-convey
- - ninja -C build-convey libgnt-doc
- build-docs-image:
- type: docker/build
- dockerfile: doc/Dockerfile
- tag: ${DOCS_TAG}
- files:
- - build-convey/doc/html:.
- publish-docs-image:
- type: docker/push
- image: ${DOCS_TAG}
+ - meson build-docs
+ - ninja -C build-docs libgnt-doc
+ docs-export:
+ type: docker/export
+ files: build-docs/doc/html:libgnt-docs
+
+ import:
+ type: docker/import
+ files: .:.
plans:
docs:
stages:
- tasks:
- - import
- - build-docs
- - build-docs-image
- ci-docs:
- stages:
- - name: prep
- tasks:
- - login
- - name: build
- tasks:
- - import
- - build-docs
- - build-docs-image
- - publish-docs-image
- - name: final
- run: always
- tasks:
- - logout
+ - docs-clean
+ - import
+ - docs-build
+ - docs-export
clean:
stages:
- tasks: clean
+ debian-bullseye-amd64:
+ environment: TARGET=debian-bullseye-amd64
+ stages:
+ - tasks: [import, build]
+
+ debian-bookworm-amd64:
+ environment: TARGET=debian-bookworm-amd64
+ stages:
+ - tasks: [import, build]
+
+ fedora-34-amd64:
+ environment: TARGET=fedora-34-amd64
+ stages:
+ - tasks: [import, build]
+