Skip to content

Commit

Permalink
Merge upstream shenandoah-jdk21u:master and corretto-21:develop into …
Browse files Browse the repository at this point in the history
…corretto-21:generational-shenandoah (#61)
  • Loading branch information
earthling-amzn authored Apr 29, 2024
1 parent 7a8c187 commit a69e2d7
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/refresh-jdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ on:
workflow_dispatch:
env:
UPSTREAM_REMOTE: https://github.com/openjdk/jdk21u
UPSTREAM_SHENANDOAH: https://github.com/openjdk/shenandoah-jdk21u
LOCAL_BRANCH: develop
LOCAL_SHENANDOAH: generational-shenandoah
jobs:
refresh-jdk:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -42,3 +44,16 @@ jobs:
git checkout lilliput
git merge origin/$LOCAL_BRANCH
git push origin lilliput
- name: "Merge openjdk/shenandoah-jdk21u:master to generational-shenandoah"
shell: bash
run: |
git checkout $LOCAL_SHENANDOAH
git fetch $UPSTREAM_SHENANDOAH master || exit 1
git merge -m "Merge upstream shenandoah" FETCH_HEAD
git push origin $LOCAL_SHENANDOAH
- name: "Merge Corretto-21 develop to generational-shenandoah"
shell: bash
run: |
git checkout $LOCAL_SHENANDOAH
git merge origin/$LOCAL_BRANCH
git push origin $LOCAL_SHENANDOAH

0 comments on commit a69e2d7

Please sign in to comment.