From 434ef9d17055c9dcd2bdf76e8255fb73fb4d725e Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 22 May 2024 16:13:54 +0300 Subject: [PATCH] Fix github actions for updating arlington and jakarta branches --- .github/workflows/update-arlington-workflow.yml | 4 ++-- .github/workflows/update-jakarta-workflow.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index 4d7bb2d..d2f3851 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -37,7 +37,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 @@ -63,7 +63,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 arlington if: success() run: | diff --git a/.github/workflows/update-jakarta-workflow.yml b/.github/workflows/update-jakarta-workflow.yml index aa00d6d..ba01055 100644 --- a/.github/workflows/update-jakarta-workflow.yml +++ b/.github/workflows/update-jakarta-workflow.yml @@ -37,7 +37,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 @@ -63,7 +63,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: |