diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6767a1c4..91992808 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -255,11 +255,14 @@ jobs: if [[ "$RUNNER_ARCH" == "ARM64" ]]; then PYEXTERNALS_PATH="arm64" WIX_ARCH="arm64" - CHOC_OPS="" + # upgrade to VS 2022 17.14 to fix arm64 bug + # https://github.com/openssl/openssl/issues/26239 + # this can go away once a new win arm64 runner + # upgrades to this version already + choco install visualstudio2022enterprise elif [[ "$RUNNER_ARCH" == "X64" ]]; then PYEXTERNALS_PATH="amd64" WIX_ARCH="x64" - CHOC_OPS="" fi LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV @@ -295,9 +298,9 @@ jobs: run: | cd "${OPENSSL_SOURCE_PATH}" # TODO: remove this once https://github.com/openssl/openssl/issues/26239 is fixed. - if ([ "$RUNNER_OS" == "Windows" ] && [ "$RUNNER_ARCH" == "ARM64" ]); then - export CFLAGS=-DNO_INTERLOCKEDOR64 - fi + #if ([ "$RUNNER_OS" == "Windows" ] && [ "$RUNNER_ARCH" == "ARM64" ]); then + # export CFLAGS=-DNO_INTERLOCKEDOR64 + #fi # --libdir=lib is needed so Python can find OpenSSL libraries "${PERL}" ./Configure --libdir=lib --prefix="${OPENSSL_INSTALL_PATH}" $OPENSSL_CONFIG_OPTS