deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

[no ci] actions: move win ARM64 VS upgrade to OpenSSL config step

Browse Source
This commit is contained in:
Jay Lee
2025-05-16 07:55:23 -04:00
committed by GitHub
parent 3a90f0d92d
commit ad17eb5e77
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yml vendored
View File

@@ -255,11 +255,6 @@ jobs:
if [[ "$RUNNER_ARCH" == "ARM64" ]]; then if [[ "$RUNNER_ARCH" == "ARM64" ]]; then
PYEXTERNALS_PATH="arm64" PYEXTERNALS_PATH="arm64"
WIX_ARCH="arm64" WIX_ARCH="arm64"
# 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 elif [[ "$RUNNER_ARCH" == "X64" ]]; then
PYEXTERNALS_PATH="amd64" PYEXTERNALS_PATH="amd64"
WIX_ARCH="x64" WIX_ARCH="x64"
@@ -297,10 +292,13 @@ jobs:
if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true' if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true'
run: | run: |
cd "${OPENSSL_SOURCE_PATH}" 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
#if ([ "$RUNNER_OS" == "Windows" ] && [ "$RUNNER_ARCH" == "ARM64" ]); then # upgrade to VS 2022 17.14 to fix arm64 bug
# export CFLAGS=-DNO_INTERLOCKEDOR64 # https://github.com/openssl/openssl/issues/26239
#fi # this can go away once a new win arm64 runner
# upgrades to this version already
choco install visualstudio2022enterprise
fi
# --libdir=lib is needed so Python can find OpenSSL libraries # --libdir=lib is needed so Python can find OpenSSL libraries
"${PERL}" ./Configure --libdir=lib --prefix="${OPENSSL_INSTALL_PATH}" $OPENSSL_CONFIG_OPTS "${PERL}" ./Configure --libdir=lib --prefix="${OPENSSL_INSTALL_PATH}" $OPENSSL_CONFIG_OPTS