Merge corretto-21/develop into lilliput-2 daily. (#87)

corretto · Dec 30, 2024 · 7c16f85 · 7c16f85
1 parent 0169ced
commit 7c16f85
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/.github/workflows/refresh-jdk.yml b/.github/workflows/refresh-jdk.yml
@@ -58,6 +58,15 @@ jobs:
                 git merge origin/$LOCAL_BRANCH
                 git push origin lilliput
 
+            - name: "Merge Corretto-21 develop to lilliput-2"
+              shell: bash
+              run: |
+                git checkout lilliput-2
+                git restore --source origin/$LOCAL_BRANCH --staged --worktree -- version.txt
+                git commit -m "Automerged version.txt from $LOCAL_BRANCH to lilliput-2" || true
+                git merge origin/$LOCAL_BRANCH
+                git push origin lilliput-2
+
             - name: "Merge openjdk/shenandoah-jdk21u:master to generational-shenandoah"
               shell: bash
               run: |