Add workflow to refresh jdk23 from upstream

corretto · Jun 19, 2024 · 9767086 · 9767086
1 parent 1079127
commit 9767086
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 37 deletions.
diff --git a/.github/workflows/refresh-jdk.yml b/.github/workflows/refresh-jdk.yml
diff --git a/.github/workflows/refresh-jdk23.yml b/.github/workflows/refresh-jdk23.yml
@@ -5,11 +5,11 @@ on:
   workflow_dispatch:
 env:
   UPSTREAM_REMOTE: https://github.com/openjdk/jdk.git
-  LOCAL_BRANCH: jdk23
+  LOCAL_BRANCH: develop
 jobs:
     refresh-jdk:
         runs-on: ubuntu-latest
-        name: "Update Corretto-jdk"
+        name: "Update Corretto-23"
         if: github.repository_owner == 'corretto'
         steps:
             - name: "Checkout code"
@@ -21,12 +21,12 @@ jobs:
               run: |
                 git config user.email "no-reply@amazon.com"
                 git config user.name "corretto-github-robot"
-            - name: "Merge openjdk/jdk:jdk23 to the corretto-jdk:jdk23"
+            - name: "Merge openjdk/jdk:jdk23 to the corretto-23:develop"
               run: |
                 git fetch $UPSTREAM_REMOTE jdk23 || exit 1
-                git merge -m "Merge upstream-jdk" FETCH_HEAD
+                git merge -m "Merge upstream-jdk23" FETCH_HEAD
             - name: "Update Corretto version"
               shell: bash
               run: bash ./.github/scripts/update-version.sh $UPSTREAM_REMOTE
-            - name: "Push to the corretto-jdk"
+            - name: "Push to the corretto-23"
               run: git push origin $LOCAL_BRANCH