diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2021-06-09 09:25:23 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-15 21:21:54 +0000 |
| commit | 02feb4df5a0e4bf9ac915aaafd8842ce9c738d73 (patch) | |
| tree | ac9a845e5db72e0bf454b71a6278fa0b7c033f56 /evergreen | |
| parent | bf657d3db9cad295c9912ebc27aa786e68076751 (diff) | |
| download | mongo-02feb4df5a0e4bf9ac915aaafd8842ce9c738d73.tar.gz | |
SERVER-55446 added rosetta and arm64 macos builders to evergreen
Diffstat (limited to 'evergreen')
| -rw-r--r-- | evergreen/functions/venv_setup.sh | 7 | ||||
| -rw-r--r-- | evergreen/prelude_python.sh | 10 | ||||
| -rwxr-xr-x | evergreen/scons_compile.sh | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/evergreen/functions/venv_setup.sh b/evergreen/functions/venv_setup.sh index 128adad9cfd..ec86d7bb539 100644 --- a/evergreen/functions/venv_setup.sh +++ b/evergreen/functions/venv_setup.sh @@ -39,6 +39,13 @@ toolchain_txt="$pip_dir/toolchain-requirements.txt" activate_venv echo "Upgrading pip to 21.0.1" + +# ref: https://github.com/grpc/grpc/issues/25082#issuecomment-778392661 +if [ "$(uname -m)" = "arm64" ] && [ "$(uname)" == "Darwin" ]; then + export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 + export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 +fi + python -m pip --disable-pip-version-check install "pip==21.0.1" || exit 1 python -m pip --disable-pip-version-check install -r "$toolchain_txt" -q --log install.log if [ $? != 0 ]; then diff --git a/evergreen/prelude_python.sh b/evergreen/prelude_python.sh index d6192c253bc..278492f7947 100644 --- a/evergreen/prelude_python.sh +++ b/evergreen/prelude_python.sh @@ -1,5 +1,13 @@ if [ "Windows_NT" = "$OS" ]; then python='/cygdrive/c/python/python37/python.exe' else - python="/opt/mongodbtoolchain/v3/bin/python3" + if [ -f /opt/mongodbtoolchain/v3/bin/python3 ]; then + python="/opt/mongodbtoolchain/v3/bin/python3" + elif [ -f "$(which python3)" ]; then + echo "Could not find mongodbtoolchain python, using system python $(which python3)" >2 + python=$(which python3) + else + echo "Could not find python3." >2 + return 1 + fi fi diff --git a/evergreen/scons_compile.sh b/evergreen/scons_compile.sh index b274fdea96c..9dac9007fae 100755 --- a/evergreen/scons_compile.sh +++ b/evergreen/scons_compile.sh @@ -32,7 +32,7 @@ fi # Conditionally enable scons time debugging if [ "${show_scons_timings}" = "true" ]; then - extra_args="$extra_args --debug=time" + extra_args="$extra_args --debug=time,stacktrace" fi # Build packages where the upload tasks expect them |