Skip to content

Commit 4e889a5

Browse files
authored
Switch JDK8u to use Skara mirror and update RELEASING.md (#2799)
* Switch JDK8u to use Skara mirror and update RELEASING.md * Update RELEASING.md
1 parent da63846 commit 4e889a5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

RELEASING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,9 @@ Here are the steps:
124124
- [OpenJ9 only] `scmReference`: extensions release branch: e.g. `openj9-0.14.0`
125125
- `additionalConfigureArgs`: JDK8 automatically adds`--with-milestone=fcs` in `build.sh` so there's no need to provide it here. For JDK11+ use `--without-version-pre --without-version-opt` (for EA releases use: `--with-version-pre=ea --without-version-opt`)
126126
- `scmReference`: One of the following:
127-
- For HotSpot JDK8, use the openjdk tag as-is e.g. `jdk8u232-b09`
128-
- For HotSpot JDK11+, it's the same tag suffixed with `_adopt` e.g. `jdk-13.0.1+9_adopt`
127+
- For HotSpot, it's the same tag suffixed with `_adopt` e.g. `jdk-13.0.1+9_adopt`
128+
- For HotSpot (arm32), the tag usually takes the form `jdk8u322-b04-aarch32-xxxxxxxx`
129+
- NOTE you need to set `overridePublishName` for arm32 to the actual OpenJDK tag (`jdk8u322-b04`)
129130
- For OpenJ9 (all versions) use the OpenJ9 branch e.g. `openj9-0.15.1`
130131
- `enableTests`: tick
131132
- SUBMIT!!

sbin/prepareWorkspace.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ checkoutAndCloneOpenJDKGitRepo() {
101101
fi
102102
fi
103103

104-
if [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_HOTSPOT}" ]] && [[ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -ge 11 ]]; then
104+
if [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_HOTSPOT}" ]]; then
105105
# Verify Adopt patches tag is being built, otherwise we may be accidently just building "raw" OpenJDK
106106
if [ ! -f "${TEMURIN_MARKER_FILE}" ] && [ "${BUILD_CONFIG[DISABLE_ADOPT_BRANCH_SAFETY]}" == "false" ]; then
107107
echo "${TEMURIN_MARKER_FILE} marker file not found in fetched source to be built, this may mean the wrong SCMReference build parameter has been specified. Ensure the correct Temurin patch release tag is specified, eg.for build jdk-11.0.4+10, it would be jdk-11.0.4+10_adopt"

0 commit comments

Comments
 (0)