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/28 23:54:14 UTC

[felix-antora] 01/01: set up preview Jenkinsfile and (for a specific preview) antora-playbook.yml

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

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

commit b4fe93c1839d934ad0ef599bfe55b72cb437bada
Author: David Jencks <dj...@apache.org>
AuthorDate: Wed Jul 28 16:53:43 2021 -0700

    set up preview Jenkinsfile and (for a specific preview) antora-playbook.yml
---
 Jenkinsfile         | 11 +++++++++--
 antora-playbook.yml | 15 +++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7d6cd22..97eff37 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,10 @@
+// preview branch copy.
+// Deploys to asf-staging, which is shown at https://felix.staged.apache.org.
+
+//Set the desired content sources in antora-playbook.yml on this branch:
+// these will typically include branches in your forks of the felix github repos.
+// Trigger the site build manually with the Jenkins https://ci-builds.apache.org/job/Felix/job/website-build-preview/ action.
+
 //these don't seem to work.
 //def siteBranch = "asf-site"
 //def siteBranch = "asf-staging"
@@ -12,7 +19,7 @@ pipeline {
             steps {
                 sh 'rm -rf build'
 // clone the felix-site-pub repo
-                sh 'git clone --depth 1 --branch asf-site https://gitbox.apache.org/repos/asf/felix-site-pub.git build/site'
+                sh 'git clone --depth 1 --branch asf-staging" https://gitbox.apache.org/repos/asf/felix-site-pub.git build/site'
                 dir('build/site') {
                     sh 'git rm -r .'
                 }
@@ -23,7 +30,7 @@ pipeline {
                 dir('build/site') {
 		          sh 'git add .'
 		          sh 'echo `git commit -m "site build"`'
-                  sh 'git push https://gitbox.apache.org/repos/asf/felix-site-pub.git asf-site'
+                  sh 'git push https://gitbox.apache.org/repos/asf/felix-site-pub.git asf-staging"'
 	        	}
             }
         }
diff --git a/antora-playbook.yml b/antora-playbook.yml
index e0219bc..d6e6972 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -1,3 +1,4 @@
+# Preview branch playbook copy
 site:
   title: Apache Felix
   url: https://felix.apache.org
@@ -10,12 +11,14 @@ content:
 #    - url: ./../felix-antora-site
 #      branches: HEAD
     # For "production" build without needing a local site checkout uncomment the next two lines and comment out the previous two.
-  - url: https://github.com/apache/felix-antora-site.git
-    branches: main
-#  - url: ./../felix-dev
-#    branches: HEAD
-#    start_paths:
-#      - scr
+#  Set up the content sources to point to what you want to preview.
+#  Most likely this will involve branches in your github forks of the felix projects.
+  - url: https://github.com/djencks/felix-antora-site.git
+    branches: scr-preview
+  - url: https://github.com/djencks/felix-dev.git
+    branches: adoc-preview
+    start_paths:
+      - scr/docs
 
 asciidoc:
   attributes: