From 482cee1010eac4600bb9d2a9d5ca18cc9bc39e4e Mon Sep 17 00:00:00 2001 From: Maxim Date: Tue, 21 May 2024 13:15:44 +0300 Subject: [PATCH] Update github actions for updating arlington branch --- .github/workflows/update-arlington-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index c9da07e..d65aca2 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.sha }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} - 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.sha }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} - name: Merge branch into arlington if: success() run: |