Pull version.txt from develop branch before merging into nightly, lil…

…liput, and generational-shenandoah to avoid merge conflicts. (#79)
corretto · Oct 18, 2024 · fbbac25 · fbbac25
1 parent cb6f9ca
commit fbbac25
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/workflows/refresh-jdk.yml b/.github/workflows/refresh-jdk.yml
@@ -36,12 +36,16 @@ jobs:
               shell: bash
               run: |
                 git checkout nightly
+                git restore --source origin/$LOCAL_BRANCH --staged --worktree -- version.txt
+                git commit -m "Automerged version.txt from $LOCAL_BRANCH to nightly" || true
                 git merge origin/$LOCAL_BRANCH
                 git push origin nightly
             - name: "Merge Corretto-21 develop to lilliput"
               shell: bash
               run: |
                 git checkout lilliput
+                git restore --source origin/$LOCAL_BRANCH --staged --worktree -- version.txt
+                git commit -m "Automerged version.txt from $LOCAL_BRANCH to lilliput" || true
                 git merge origin/$LOCAL_BRANCH
                 git push origin lilliput
             - name: "Merge openjdk/shenandoah-jdk21u:master to generational-shenandoah"
@@ -55,5 +59,7 @@ jobs:
               shell: bash
               run: |
                 git checkout $LOCAL_SHENANDOAH
+                git restore --source origin/$LOCAL_BRANCH --staged --worktree -- version.txt
+                git commit -m "Automerged version.txt from $LOCAL_BRANCH to $LOCAL_SHENANDOAH" || true
                 git merge origin/$LOCAL_BRANCH
                 git push origin $LOCAL_SHENANDOAH