Fix github actions for updating arlington and jakarta branch

veraPDF · May 21, 2024 · 54edbfd · 54edbfd
1 parent 8774e9a
commit 54edbfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml
@@ -53,7 +53,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
@@ -79,7 +79,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: |

diff --git 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.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 jakarta
         if: success()
         run: |