Fix github actions for updating jakarta branch

veraPDF · May 22, 2024 · 47a8c00 · 47a8c00
1 parent 2229425
commit 47a8c00
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 "[email protected]"
       - 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 "[email protected]"
       - 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: |