diff --git a/.github/workflows/refresh-jdk.yml b/.github/workflows/refresh-jdk.yml index 56a24a3cfdd..d1aac6118f7 100644 --- 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: |