From 91b18c7bfafb8ef82e4d5abbb2fde4d45845e87e Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Tue, 13 Jun 2023 14:42:38 +0100 Subject: [PATCH 1/4] AV-57335 POC config to antora-ify sources See https://github.com/couchbase/docs-site/pull/699 This extension uses the config in antora.yml to call getafix.sh and copy relevant sources into a modules/ structure. (This is POC, so I've just copied some random sources) --- asterixdb/asterix-doc/antora.yml | 8 ++++++++ asterixdb/asterix-doc/clean.sh | 3 +++ asterixdb/asterix-doc/getafix.sh | 11 +++++++++++ 3 files changed, 22 insertions(+) create mode 100644 asterixdb/asterix-doc/antora.yml create mode 100755 asterixdb/asterix-doc/clean.sh create mode 100755 asterixdb/asterix-doc/getafix.sh diff --git a/asterixdb/asterix-doc/antora.yml b/asterixdb/asterix-doc/antora.yml new file mode 100644 index 00000000000..7303acdf539 --- /dev/null +++ b/asterixdb/asterix-doc/antora.yml @@ -0,0 +1,8 @@ +name: analytics +version: true +ext: + collector: + run: + command: asterixdb/asterix-doc/getafix.sh + scan: + dir: build diff --git a/asterixdb/asterix-doc/clean.sh b/asterixdb/asterix-doc/clean.sh new file mode 100755 index 00000000000..457bf67fd05 --- /dev/null +++ b/asterixdb/asterix-doc/clean.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +rm -rf build/ diff --git a/asterixdb/asterix-doc/getafix.sh b/asterixdb/asterix-doc/getafix.sh new file mode 100755 index 00000000000..730754e4f55 --- /dev/null +++ b/asterixdb/asterix-doc/getafix.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +cd $(dirname $0) + +./clean.sh + +mkdir -p modules/asterixdb/partials/ + +cp -r src/site/markdown/ modules/asterixdb/partials/ + + From 70f7e12e62afa426fee08cc5fe1613eadc8404cc Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Wed, 14 Jun 2023 12:27:55 +0100 Subject: [PATCH 2/4] docs-fun tweak --- asterixdb/asterix-doc/clean.sh | 3 --- asterixdb/asterix-doc/getafix.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100755 asterixdb/asterix-doc/clean.sh diff --git a/asterixdb/asterix-doc/clean.sh b/asterixdb/asterix-doc/clean.sh deleted file mode 100755 index 457bf67fd05..00000000000 --- a/asterixdb/asterix-doc/clean.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -rm -rf build/ diff --git a/asterixdb/asterix-doc/getafix.sh b/asterixdb/asterix-doc/getafix.sh index 730754e4f55..e245c7a5f8d 100755 --- a/asterixdb/asterix-doc/getafix.sh +++ b/asterixdb/asterix-doc/getafix.sh @@ -2,7 +2,7 @@ cd $(dirname $0) -./clean.sh +rm -rf modules/ mkdir -p modules/asterixdb/partials/ From 87e888c062095f2422d677526f4ca5890e2e68d2 Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Wed, 14 Jun 2023 12:34:25 +0100 Subject: [PATCH 3/4] Update `dir` parameter After Dan's advice on https://gitlab.com/antora/antora-collector-extension/-/issues/9 --- asterixdb/asterix-doc/antora.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/asterixdb/asterix-doc/antora.yml b/asterixdb/asterix-doc/antora.yml index 7303acdf539..2b8898f0048 100644 --- a/asterixdb/asterix-doc/antora.yml +++ b/asterixdb/asterix-doc/antora.yml @@ -3,6 +3,7 @@ version: true ext: collector: run: - command: asterixdb/asterix-doc/getafix.sh + dir: . + command: ./getafix.sh scan: dir: build From 9f27c1404292056cf3659195773d33af52fb1ecc Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Wed, 28 Jun 2023 15:19:00 +0100 Subject: [PATCH 4/4] docs-fun Added .gitignore to make sure modules/ isn't checked in --- asterixdb/asterix-doc/.gitignore | 1 + asterixdb/asterix-doc/getafix.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 asterixdb/asterix-doc/.gitignore diff --git a/asterixdb/asterix-doc/.gitignore b/asterixdb/asterix-doc/.gitignore new file mode 100644 index 00000000000..52146d6cccf --- /dev/null +++ b/asterixdb/asterix-doc/.gitignore @@ -0,0 +1 @@ +modules/ diff --git a/asterixdb/asterix-doc/getafix.sh b/asterixdb/asterix-doc/getafix.sh index e245c7a5f8d..05b1fff8043 100755 --- a/asterixdb/asterix-doc/getafix.sh +++ b/asterixdb/asterix-doc/getafix.sh @@ -1,11 +1,13 @@ #!/bin/bash +echo DEBUG: running the Collector script + cd $(dirname $0) rm -rf modules/ mkdir -p modules/asterixdb/partials/ -cp -r src/site/markdown/ modules/asterixdb/partials/ +cp -r src/main/markdown/ modules/asterixdb/partials/