generate_source_tarball.sh: Skip -ga tags

- Related: RHEL-27133
This commit is contained in:
Thomas Fitzsimmons 2024-02-01 17:14:23 -05:00 committed by Andrew Hughes
parent 829ee7a256
commit bf109bbddb
2 changed files with 9 additions and 0 deletions

View File

@ -81,9 +81,17 @@ if [ "$OPENJDK_LATEST" != "" ] ; then
| tail --lines 1) | tail --lines 1)
PROJECT_NAME=openjdk PROJECT_NAME=openjdk
REPO_NAME=jdk"${FEATURE_VERSION}"u REPO_NAME=jdk"${FEATURE_VERSION}"u
# Skip -ga tags since those are the same as the most recent non-ga tag, and
# the non-ga tag is the one that is used to generated the official source
# tarball. For example:
# ca760c86642aa2e0d9b571aaabac054c0239fbdc refs/tags/jdk-17.0.10-ga^{}
# 25a2e6c20c9a96853714284cabc6b456eb095070 refs/tags/jdk-17.0.10-ga
# ca760c86642aa2e0d9b571aaabac054c0239fbdc refs/tags/jdk-17.0.10+7^{}
# e49c5749b10f3e90274b72e9279f794fdd191d27 refs/tags/jdk-17.0.10+7
VERSION=$(git ls-remote --tags --refs --sort=-version:refname \ VERSION=$(git ls-remote --tags --refs --sort=-version:refname \
"${OPENJDK_URL_DEFAULT}/${PROJECT_NAME}/${REPO_NAME}.git" \ "${OPENJDK_URL_DEFAULT}/${PROJECT_NAME}/${REPO_NAME}.git" \
"jdk-${FEATURE_VERSION}*" \ "jdk-${FEATURE_VERSION}*" \
| grep --invert-match '\-ga$' \
| head --lines 1 | cut --characters 52-) | head --lines 1 | cut --characters 52-)
FILE_NAME_ROOT=open${VERSION} FILE_NAME_ROOT=open${VERSION}
WITH_TEMP=1 WITH_TEMP=1

View File

@ -2491,6 +2491,7 @@ require "copy_jdk_configs.lua"
- Use featurever macro to specify fips patch - Use featurever macro to specify fips patch
- Explain patchN syntax situation in a comment - Explain patchN syntax situation in a comment
- generate_source_tarball.sh: Fix whitespace - generate_source_tarball.sh: Fix whitespace
- generate_source_tarball.sh: Skip -ga tags
- Related: RHEL-27133 - Related: RHEL-27133
* Thu Jan 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.10.0.7-2 * Thu Jan 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.10.0.7-2