This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new 5813035c8d Use theirs from source commit when cherry-picking to site
branch
5813035c8d is described below
commit 5813035c8d8ef7b73dcdd2ef87230a58894dbd3c
Author: Francis Chuang <[email protected]>
AuthorDate: Wed Apr 27 09:56:42 2022 +1000
Use theirs from source commit when cherry-picking to site branch
---
.github/workflows/publish-non-release-website-updates.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/publish-non-release-website-updates.yml
b/.github/workflows/publish-non-release-website-updates.yml
index 97b8bd6518..f7a9457406 100644
--- a/.github/workflows/publish-non-release-website-updates.yml
+++ b/.github/workflows/publish-non-release-website-updates.yml
@@ -39,7 +39,11 @@ jobs:
run: |
git config user.email ${{ github.actor }}@users.noreply.github.com
git config user.name ${{ github.actor }}
- git cherry-pick $GITHUB_SHA
+ git cherry-pick --strategy=recursive -X theirs $GITHUB_SHA
+ if [ $? -neq 0 ]; then
+ git status | sed -n 's/deleted by us://p' | xargs git add
+ git cherry-pick --continue --no-edit
+ fi
git push origin site
publish-website:
