replaced ${ARCHITECTURE}" by "${BUILD_CONFIG[OS_ARCHITECTURE]}"

[judovana]

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

I'm just testing it on widows VM. But it seems that the ARCHITETURE is indeed not set. Please eyball carefully, I'm unable to judge the impact

[judovana]

the build failure: https://github.com/adoptium/temurin-build/actions/runs/9301406891/job/25599478960 is related

[judovana]

fixed

[judovana]

grep -r ARCHITECTURE=
sbin/common/downloaders.sh:      local ARCHITECTURE="${1}"
build-farm/platform-specific-configurations/mac.sh:MACHINEARCHITECTURE=$(uname -m)
build-farm/platform-specific-configurations/linux.sh:       echo /bin/ls is not a 32-bit binary but ARCHITECTURE=arm. Non-32-bit userland is invalid without extra work
build-farm/make-adopt-build-farm.sh:   ARCHITECTURE=$(uname -p)
build-farm/make-adopt-build-farm.sh:   if [ "$OSTYPE" = "cygwin"  ] || [ "${ARCHITECTURE}" = "unknown" ]; then ARCHITECTURE=$(uname -m); fi # Windows / Alpine
build-farm/make-adopt-build-farm.sh:   if [ "$ARCHITECTURE" = "x86_64"  ]; then ARCHITECTURE=x64;        fi # Linux/x64
build-farm/make-adopt-build-farm.sh:   if [ "$ARCHITECTURE" = "i386"    ]; then ARCHITECTURE=x64;        fi # Solaris/x64 and mac/x64
build-farm/make-adopt-build-farm.sh:   if [ "$ARCHITECTURE" = "sparc"   ]; then ARCHITECTURE=sparcv9;    fi # Solaris/SPARC
build-farm/make-adopt-build-farm.sh:   if [ "$ARCHITECTURE" = "powerpc" ]; then ARCHITECTURE=ppc64;      fi # AIX
build-farm/make-adopt-build-farm.sh:   if [ "$ARCHITECTURE" = "arm"     ]; then ARCHITECTURE=aarch64;    fi # mac/aarch64
build-farm/make-adopt-build-farm.sh:   if [ "$ARCHITECTURE" = "armv7l"  ]; then ARCHITECTURE=arm;        fi # Linux/arm32
docker/dockerfile-generator.sh:ENV ARCHITECTURE=x64

I really think it is bad sed/refactoring/reuse or whatever.. as ARCHITECTURE seems to be related only to build-farm. Except that docker file

docker/dockerfile-generator.sh-
docker/dockerfile-generator.sh-printContainerVars(){
docker/dockerfile-generator.sh-  echo "
docker/dockerfile-generator.sh-ARG OPENJDK_CORE_VERSION
docker/dockerfile-generator.sh-ENV OPENJDK_CORE_VERSION=\$OPENJDK_CORE_VERSION
docker/dockerfile-generator.sh:ENV ARCHITECTURE=x64
docker/dockerfile-generator.sh-ENV JDK_PATH=jdk
docker/dockerfile-generator.sh-ENV JDK8_BOOT_DIR=/usr/lib/jvm/jdk8" >> "$DOCKERFILE_PATH"
docker/dockerfile-generator.sh-}
docker/dockerfile-generator.sh-
docker/dockerfile-generator.sh-generateFile() {

Where however

grep -e ARCHITECTURE docker/dockerfile-generator.sh 
ENV ARCHITECTURE=x64
BUILD_CONFIG[OS_ARCHITECTURE]=\"x86_64\"

it do not seem to b eused.

[judovana]

@andrew-m-leonard @sxa thoughts?

[andrew-m-leonard]

@andrew-m-leonard @sxa thoughts?

@judovana so we have to be careful here, as OS_ARCHITECTURE is the "BUILD arch", whereas ARCHITECTURE is the TARGET arch
We have a known issue with these variables that needs investigating: #3648

Incorrect understanding

[judovana]

Just to clarify, I'm not sure why your builders are passing, but the ARCHITECTURE: unbound variable is default build of jdk8 on windows. This really should be fixed.

[andrew-m-leonard]

Looks good I think

[andrew-m-leonard]

Just to clarify, I'm not sure why your builders are passing, but the ARCHITECTURE: unbound variable is default build of jdk8 on windows. This really should be fixed.

The builders use the build-farm, which set ARCHITECTURE

[judovana]

ty!