deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 12:51:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

actions: remove some of the workaround for win arm64 no longer needed

Browse Source
This commit is contained in:
Jay Lee
2025-07-19 09:37:55 -04:00
committed by GitHub
parent 4c63de65a5
commit 701824d984
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,10 +292,10 @@ 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}"
if ([ "$RUNNER_OS" == "Windows" ] && [ "$RUNNER_ARCH" == "ARM64" ]); then #if ([ "$RUNNER_OS" == "Windows" ] && [ "$RUNNER_ARCH" == "ARM64" ]); then
# https://github.com/openssl/openssl/issues/26239 # https://github.com/openssl/openssl/issues/26239
export CFLAGS=-DNO_INTERLOCKEDOR64 #export CFLAGS=-DNO_INTERLOCKEDOR64
fi #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
@@ -310,9 +310,9 @@ jobs:
run: | run: |
cd "${OPENSSL_SOURCE_PATH}" cd "${OPENSSL_SOURCE_PATH}"
# TODO: remove this once https://github.com/openssl/openssl/issues/26239 is fixed. # 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
export CFLAGS=-DNO_INTERLOCKEDOR64 # export CFLAGS=-DNO_INTERLOCKEDOR64
fi #fi
$MAKE "$MAKEOPT" $MAKE "$MAKEOPT"
- name: Install OpenSSL - name: Install OpenSSL
@@ -462,7 +462,7 @@ jobs:
curl -O -L "$latest_crypt_whl" curl -O -L "$latest_crypt_whl"
"$PYTHON" -m pip install cryptography*.whl "$PYTHON" -m pip install cryptography*.whl
- uses: actions-rust-lang/setup-rust-toolchain@v1 #- uses: actions-rust-lang/setup-rust-toolchain@v1
# - name: Compile cryptography from source (no legacy) # - name: Compile cryptography from source (no legacy)
# if: runner.os != 'Windows' || runner.arch != 'ARM64' # if: runner.os != 'Windows' || runner.arch != 'ARM64'