From 97e6426f92deec2d3c6b08873732e16c7c8c340c Mon Sep 17 00:00:00 2001
From: William Kemper <71722661+earthling-amzn@users.noreply.github.com>
Date: Fri, 12 Jul 2024 10:13:41 -0700
Subject: [PATCH] Only take tags from jdk-24 lineage

---
 .github/workflows/merge-from-upstream-tip.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/merge-from-upstream-tip.yml b/.github/workflows/merge-from-upstream-tip.yml
index 015321a524d..59a23311a9f 100644
--- a/.github/workflows/merge-from-upstream-tip.yml
+++ b/.github/workflows/merge-from-upstream-tip.yml
@@ -30,7 +30,7 @@ jobs:
         run: |
           git remote add upstream https://github.com/openjdk/jdk.git
           git fetch upstream
-          echo "latest=$(git tag --list --sort=-creatordate | head -1)" >> "$GITHUB_OUTPUT"
+          echo "latest=$(git tag --list --sort=-creatordate | grep jdk-24 | head -1)" >> "$GITHUB_OUTPUT"
       - name: Reset the default branch with latest tag
         run: |
           git reset --hard ${{ steps.latest-tag.outputs.latest }}