rpms/java-21-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST

Browse Source 
Related: RHEL-30946
This commit is contained in:
Thomas Fitzsimmons 2024-01-24 16:59:54 -05:00 committed by Andrew Hughes
parent 71c35cc1e4
commit 1f3242fb02
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
generate_source_tarball.sh
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 -v '\-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

1
java-21-openjdk.spec
View File

@ -2526,6 +2526,7 @@ cjc.mainProgram(args)
- generate_source_tarball.sh: shellcheck: Do not use -a (SC2166) - generate_source_tarball.sh: shellcheck: Do not use -a (SC2166)
- generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004) - generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004)
- Use backward-compatible patch syntax - Use backward-compatible patch syntax
- generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST
- Related: RHEL-30946 - Related: RHEL-30946
* Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea