From 26f8a6b8ebc3f196d455069734b9ec0cfbca936e Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Tue, 6 Jun 2023 11:36:03 +0100 Subject: [PATCH 1/2] Update playbook and Jenkins for @asciidoctor/tabs --- Dockerfile.jenkins | 1 + antora-playbook.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index 80aa8d2b53..fe7feab118 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -9,6 +9,7 @@ RUN addgroup -g $GROUP_ID jenkins && \ yarn global add --ignore-optional --silent git+https://gitlab.com/opendevise/oss/antora-site-generator-ms#as-extension && \ yarn global add --ignore-optional --silent asciidoctor-kroki && \ yarn global add --ignore-optional --silent asciidoctor-external-callout@1.2.0 && \ + yarn global add --ignore-optional --silent https://yarn.pm/@asciidoctor/tabs && \ yarn global add --ignore-optional --silent markdown-it && \ yarn global add --ignore-optional --silent yaml && \ apk add --no-cache --quiet --virtual .build-deps py3-pip && \ diff --git a/antora-playbook.yml b/antora-playbook.yml index 640c866d5d..83f9aca072 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -171,6 +171,7 @@ asciidoc: idprefix: '@' idseparator: '-@' tabs: tabs + tabs-sync-option: true toc: ~ xrefstyle: short enterprise: https://www.couchbase.com/products/editions[ENTERPRISE EDITION] @@ -191,10 +192,9 @@ asciidoc: - ./lib/template-block.js - asciidoctor-kroki - asciidoctor-external-callout + - @asciidoctor/tabs ui: bundle: - url: https://github.com/couchbase/docs-ui/releases/download/prod-165/ui-bundle.zip - #url: https://deploy-preview-xxx--cb-docs-ui.netlify.app/dist/ui-bundle.zip - #snapshot: true + url: https://github.com/couchbase/docs-ui/releases/download/prod-167/ui-bundle.zip output: dir: ./public From a2b6d78aed52ed2d9acc74a647eb61aa56560ef8 Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Tue, 6 Jun 2023 14:48:30 +0100 Subject: [PATCH 2/2] AV-55075: fix yaml --- antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 83f9aca072..b9c4007fef 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -192,7 +192,7 @@ asciidoc: - ./lib/template-block.js - asciidoctor-kroki - asciidoctor-external-callout - - @asciidoctor/tabs + - '@asciidoctor/tabs' ui: bundle: url: https://github.com/couchbase/docs-ui/releases/download/prod-167/ui-bundle.zip