This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-website.git
The following commit(s) were added to refs/heads/main by this push:
new ef8bf5ca ci: fast-forward asf-site from the GitHub mirror before
publishing (#1794)
ef8bf5ca is described below
commit ef8bf5ca9176841ab42aac8b590cc095a3113156
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Oct 1 07:03:08 2026 +0200
ci: fast-forward asf-site from the GitHub mirror before publishing (#1794)
A push that reached GitHub but not gitbox left the two asf-site branches
diverged, so the gitbox sync hook rejected every later website publish.
Fast-forwarding to the GitHub branch after cloning heals that automatically.
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
---
Jenkinsfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 07bf3aa7..1ded8819 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -97,6 +97,8 @@ pipeline {
dir('deploy/live') {
deleteDir()
sh 'git clone -b asf-site
https://gitbox.apache.org/repos/asf/camel-website-pub.git .'
+ // catch up with the GitHub mirror in case a previous push
reached GitHub but not gitbox, which would make the gitbox sync hook reject
every push
+ sh 'git pull --ff-only
https://github.com/apache/camel-website-pub.git asf-site || true'
sh "rsync -a --delete --exclude='.git'
--exclude='.asf.yaml' $WORKSPACE/camel-website/public/ ."
sh 'git add -A'
sh "git checkout $VALID_ASF_YAML -- ./.asf.yaml" // force
revert to commit containing the valid .asf.yml
