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
The following commit(s) were added to refs/heads/master by this push:
new 5d004f7 fix: git publish
5d004f7 is described below
commit 5d004f7bfc2a39bd8c526f888a6d447db142c98b
Author: Zoran Regvart <[email protected]>
AuthorDate: Thu Apr 8 11:55:45 2021 +0200
fix: git publish
Last build failed with `ERROR: script returned exit code 1`, my guess is
that it's caused by the `grep -v` bit added in the last commit. This
removes it and also changes the git directory from `deploy/staging` to
`deploy/live` to better reflect the usage.
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bed37b2..98d9964 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -85,10 +85,10 @@ pipeline {
}
steps {
- dir('deploy/staging') {
+ dir('deploy/live') {
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 -q --interactive $STOP_SQUASH_AT |
grep -v 'create mode 100644'" // squash all but initial and last 9 commits
+ sh "git -c core.editor='sed -i 2,/\$(git log --skip=9 -1
--pretty=format:%h)/s/^pick/squash/' rebase -q --interactive $STOP_SQUASH_AT"
// squash all but initial and last 9 commits
sh 'git rm -q -r *'
sh "cp -R $WORKSPACE/camel-website/public/. ."
sh 'git add .'
