From 8038ca2960f31dacb93406063341ffdcedc03169 Mon Sep 17 00:00:00 2001 From: jprochazk Date: Thu, 7 Nov 2024 15:36:44 +0100 Subject: [PATCH] use a squash commit instead of merge --- .github/workflows/auto_docs_check.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto_docs_check.yml b/.github/workflows/auto_docs_check.yml index f1918d25be01..861961015f87 100644 --- a/.github/workflows/auto_docs_check.yml +++ b/.github/workflows/auto_docs_check.yml @@ -42,11 +42,12 @@ jobs: git fetch origin main git checkout main - git merge origin/${{ github.event.pull_request.head.ref }} + git merge --squash origin/${{ github.event.pull_request.head.ref }} + git commit -m "${{ github.event.pull_request.head.title }} (#${{ github.event.pull_request.number }})" commit=$(git rev-parse HEAD) git checkout docs-latest - if git cherry-pick $commit -m1; then + if git cherry-pick $commit; then echo "Cherry-pick successful" exit 0 else