You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2021/07/12 02:18:55 UTC

[felix-antora] branch main updated: add supplemental-ui, tweak build

This is an automated email from the ASF dual-hosted git repository.

djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/felix-antora.git


The following commit(s) were added to refs/heads/main by this push:
     new 276f692  add supplemental-ui, tweak build
276f692 is described below

commit 276f69278dbfa74091bfdc6befb60fe6d27d8e0e
Author: David Jencks <dj...@apache.org>
AuthorDate: Sun Jul 11 19:18:43 2021 -0700

    add supplemental-ui, tweak build
---
 antora-playbook.yml       | 6 ++++--
 package.json              | 3 ++-
 supplemental-ui/.asf.yaml | 8 ++++++++
 supplemental-ui/.htaccess | 0
 supplemental-ui/ui.yml    | 3 +++
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/antora-playbook.yml b/antora-playbook.yml
index 44b160c..a019ec9 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -22,6 +22,8 @@ ui:
   bundle:
     url: node_modules/@felix/felix-antora-ui/build/felix-antora-ui-bundle.zip
     snapshot: false
+  #currently .htaccess has to be copied by hand, see https://gitlab.com/antora/antora/-/issues/627 and package.json
+  supplemental_files: ./supplemental-ui
 
-output:
-  clean: true
+#output:
+#  clean: true
diff --git a/package.json b/package.json
index a407183..924fb75 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
     "clean-build": "npm run clean-install;npm run build",
     "clean-install": "rm -rf node_modules/ .cache/ package-lock.json;npm i --cache=.cache/npm",
     "plain-install": "npm i --cache=.cache/npm",
-    "build": "node_modules/.bin/antora antora-playbook.yml --stacktrace --fetch --clean"
+    "build": "node_modules/.bin/antora antora-playbook.yml --stacktrace --fetch --clean",
+    "build-noclean": "node_modules/.bin/antora antora-playbook.yml --stacktrace --fetch;cp ./supplemental-ui/.htaccess ./build/site/;cp ./supplemental-ui/.asf.yaml ./build/site/"
   },
   "devDependencies": {
     "@antora/cli": "^2.3.3",
diff --git a/supplemental-ui/.asf.yaml b/supplemental-ui/.asf.yaml
new file mode 100644
index 0000000..ec7e7b6
--- /dev/null
+++ b/supplemental-ui/.asf.yaml
@@ -0,0 +1,8 @@
+notifications:
+  commits: site-pub@felix.apache.org
+  issues: site-pub@felix.apache.org
+  pullrequests: site-pub@felix.apache.org
+  jira_options: link label link label
+
+publish:
+  whoami: asf-site
diff --git a/supplemental-ui/.htaccess b/supplemental-ui/.htaccess
new file mode 100644
index 0000000..e69de29
diff --git a/supplemental-ui/ui.yml b/supplemental-ui/ui.yml
new file mode 100644
index 0000000..52aaf77
--- /dev/null
+++ b/supplemental-ui/ui.yml
@@ -0,0 +1,3 @@
+static_files:
+- .htaccess
+- .asf.yml