From 47a8c00bafba7b5cdb507af289d3f5e21074a2fe Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 22 May 2024 16:05:24 +0300 Subject: [PATCH] Fix github actions for updating jakarta branch --- .github/workflows/update-jakarta-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-jakarta-workflow.yml b/.github/workflows/update-jakarta-workflow.yml index c4bdeaaf..7234448d 100644 --- a/.github/workflows/update-jakarta-workflow.yml +++ b/.github/workflows/update-jakarta-workflow.yml @@ -38,7 +38,7 @@ jobs: git config user.name "Git User" git config user.email "user@test.com" - name: Add commit to the test branch - run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop - name: Build project with Maven if: success() run: mvn --batch-mode --update-snapshots verify @@ -64,7 +64,7 @@ jobs: git config user.name "Git User" git config user.email "user@temp.com" - name: Add commit to new branch - run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop - name: Merge branch into jakarta if: success() run: |