Update build.yml

This commit is contained in:
Jay Lee
2022-02-28 21:10:38 -05:00
committed by GitHub
parent 94a52c80cd
commit 2ce04b4dd2

View File

@ -158,11 +158,6 @@ jobs:
echo "PYTHON=${PYTHON_INSTALL_PATH}/bin/python3" >> $GITHUB_ENV echo "PYTHON=${PYTHON_INSTALL_PATH}/bin/python3" >> $GITHUB_ENV
export date=gdate export date=gdate
export realpath=grealpath export realpath=grealpath
echo "CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1" >> $GITHUB_ENV
echo "CFLAGS=-I${OPENSSL_INSTALL_PATH}/include -arch arm64 -arch x86_64" >> $GITHUB_ENV
echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV
echo "LDFLAGS=${OPENSSL_INSTALL_PATH}/lib/libssl.a" >> $GITHUB_ENV
echo "ARCHFLAGS=-arch x86_64 -arch arm64" >> $GITHUB_ENV
echo 'PIP_ARGS=( "--no-binary" ":all:" )' >> $GITHUB_ENV echo 'PIP_ARGS=( "--no-binary" ":all:" )' >> $GITHUB_ENV
elif [[ "${RUNNER_OS}" == "Linux" ]]; then elif [[ "${RUNNER_OS}" == "Linux" ]]; then
MAKE=make MAKE=make
@ -239,8 +234,6 @@ jobs:
- name: Make OpenSSL - name: Make OpenSSL
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: |
# clear LDFLAGS for now
unset LDFLAGS
for openssl_arch in $openssl_archs; do for openssl_arch in $openssl_archs; do
cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_arch}" cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_arch}"
$MAKE "${MAKEOPT}" $MAKE "${MAKEOPT}"
@ -270,6 +263,11 @@ jobs:
-output "bin/ssl/bin/openssl" -output "bin/ssl/bin/openssl"
rm -rf bin/ssl-darwin64-x86_64 rm -rf bin/ssl-darwin64-x86_64
rm -rf bin/ssl-darwin64-arm64 rm -rf bin/ssl-darwin64-arm64
echo "LDFLAGS=${OPENSSL_INSTALL_PATH}/lib/libssl.a" >> $GITHUB_ENV
echo "CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1" >> $GITHUB_ENV
echo "CFLAGS=-I${OPENSSL_INSTALL_PATH}/include -arch arm64 -arch x86_64" >> $GITHUB_ENV
echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV
echo "ARCHFLAGS=-arch x86_64 -arch arm64" >> $GITHUB_ENV
else else
mv "bin/ssl-${openssl_archs}" bin/ssl mv "bin/ssl-${openssl_archs}" bin/ssl
fi fi