Skip to content

Commit

Permalink
replaced ${ARCHITECTURE}" by "${BUILD_CONFIG[OS_ARCHITECTURE]}" (#3830)
Browse files Browse the repository at this point in the history
* replaced ${ARCHITECTURE}" by  "${BUILD_CONFIG[OS_ARCHITECTURE]}"

This should fix windows issue I see:
Certificate was added to keystore
Number of certs processed: 147

real	2m26.134s
user	0m42.929s
sys	0m24.072s
build.sh : 20:48:54 : Initiating build ...
Version: local dir; OPENJDK_BUILD_NUMBER set as
/home/tester/temurinbuild-1717011006/temurin-build/sbin/build.sh: line 193: ARCHITECTURE: unbound variable
+ BUILD_RESULT=1
+ popd

* Adjsuted vlaue of arch to new expected value
  • Loading branch information
judovana authored Jun 12, 2024
1 parent d57edcf commit 7c3fe8e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sbin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ getOpenJDKUpdateAndBuildVersion() {
patchFreetypeWindows() {
# Allow freetype 2.8.1 to be built for JDK8u with Visual Studio 2017 (see https://github.com/openjdk/jdk8u-dev/pull/3#issuecomment-1087677766).
# Don't apply the patch for OpenJ9 (OpenJ9 doesn't need the patch and, technically, it should only be applied for version 2.8.1).
if [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" = "${JDK8_CORE_VERSION}" ] && [ "${ARCHITECTURE}" = "x64" ] && [ "${BUILD_CONFIG[BUILD_VARIANT]}" != "${BUILD_VARIANT_OPENJ9}" ]; then
if [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" = "${JDK8_CORE_VERSION}" ] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" = "x86_64" ] && [ "${BUILD_CONFIG[BUILD_VARIANT]}" != "${BUILD_VARIANT_OPENJ9}" ]; then
rm "${BUILD_CONFIG[WORKSPACE_DIR]}/libs/freetype/builds/windows/vc2010/freetype.vcxproj"
# Copy the replacement freetype.vcxproj file from the .github directory
cp "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}/.github/workflows/freetype.vcxproj" "${BUILD_CONFIG[WORKSPACE_DIR]}/libs/freetype/builds/windows/vc2010/freetype.vcxproj"
Expand Down Expand Up @@ -1327,7 +1327,7 @@ getGradleJavaHome() {

# Special case arm because for some unknown reason the JDK11_BOOT_DIR that arm downloads is unable to form connection
# to services.gradle.org
if [ ${JDK11_BOOT_DIR+x} ] && [ -d "${JDK11_BOOT_DIR}" ] && [ "${ARCHITECTURE}" != "arm" ]; then
if [ ${JDK11_BOOT_DIR+x} ] && [ -d "${JDK11_BOOT_DIR}" ] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" != "arm" ]; then
gradleJavaHome=${JDK11_BOOT_DIR}
fi

Expand Down

0 comments on commit 7c3fe8e

Please sign in to comment.