You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2020/11/02 13:42:54 UTC
[camel-website] branch master updated (8cafa69 -> 2c5cf78)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git.
from 8cafa69 fix: restore blackfriday renderer
new 18e1e02 refactor: single git source with multiple branches
new 8d4e742 chore: use $GIT_COMMIT for commit message
new 2c5cf78 chore: squash all but 10 commits on asf-site
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 3 ++-
antora-playbook.yml | 30 +++++++++++-------------------
2 files changed, 13 insertions(+), 20 deletions(-)
[camel-website] 01/03: refactor: single git source with multiple
branches
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 18e1e02eed8da2412bde63f30382b4c2affd2cbc
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 2 14:39:47 2020 +0100
refactor: single git source with multiple branches
It's a bit easier to follow/maintain what branches we build if we list
them on the single git source. We need multiple same sources only if the
docs are organized in different start paths.
---
antora-playbook.yml | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/antora-playbook.yml b/antora-playbook.yml
index 92df330..4f2a543 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -11,13 +11,10 @@ content:
start_paths:
# manual
- docs/user-manual
- # eip
- - core/camel-core-engine/src/main/docs
- # main components doc
- - docs/components
- url: git@github.com:apache/camel.git
branches:
+ - master
- camel-3.6.x
start_paths:
# eip
@@ -60,25 +57,20 @@ content:
branches: HEAD
start_path: docs
- url: git@github.com:apache/camel-kafka-connector.git
- branches: master
- start_path: docs
- - url: git@github.com:apache/camel-kafka-connector.git
- branches: camel-kafka-connector-0.6.x
- start_path: docs
- - url: git@github.com:apache/camel-kafka-connector.git
- branches: camel-kafka-connector-0.4.x
- start_path: docs
- - url: git@github.com:apache/camel-spring-boot.git
- branches: master
+ branches:
+ - master
+ - camel-kafka-connector-0.6.x
+ - camel-kafka-connector-0.4.x
start_path: docs
- url: git@github.com:apache/camel-spring-boot.git
- branches: camel-spring-boot-3.4.x
- start_path: docs
- - url: git@github.com:apache/camel-karaf.git
- branches: master
+ branches:
+ - master
+ - camel-spring-boot-3.4.x
start_path: docs
- url: git@github.com:apache/camel-karaf.git
- branches: camel-karaf-3.4.x
+ branches:
+ - master
+ - camel-karaf-3.4.x
start_path: docs
ui:
[camel-website] 02/03: chore: use $GIT_COMMIT for commit message
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 8d4e742abe9d2b85d05e53a89283d07cad338399
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 2 14:41:03 2020 +0100
chore: use $GIT_COMMIT for commit message
Otherwise we're just pointing from the `asf-site` commits to the same
branch, and the intent would be to point to the commit on the main
branch.
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 064a0bd..b4f25b9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -90,7 +90,7 @@ pipeline {
sh 'git rm -r *'
sh "cp -R $WORKSPACE/camel-website/public/. ."
sh 'git add .'
- sh 'git commit -m "Website updated to $(git rev-parse --short HEAD)"'
+ sh 'git commit -m "Website updated to $GIT_COMMIT"'
sh 'git push origin asf-site'
}
}
[camel-website] 03/03: chore: squash all but 10 commits on asf-site
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 2c5cf78f8aad32c30f1528545337eb5a1fabc26a
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Nov 2 14:42:04 2020 +0100
chore: squash all but 10 commits on asf-site
To try to reduce the amount of data stored in git this squashes all but
the initial and the last 10 commits on the asf-site when deploying.
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index b4f25b9..929cab2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,6 +87,7 @@ pipeline {
dir('deploy/staging') {
deleteDir()
sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website.git .'
+ sh 'git -c core.editor="sed -i 2,/$(git log --skip=9 -1 --pretty=format:%h)/s/^pick/squash/" rebase --interactive 1586f65bf7f24784dc99e22aff08e44c7dbb1920' # squash all but initial and last 9 commits
sh 'git rm -r *'
sh "cp -R $WORKSPACE/camel-website/public/. ."
sh 'git add .'