From 7772af2bec8f4e44c31289f9911f49f0880df7b6 Mon Sep 17 00:00:00 2001 From: jsflax Date: Tue, 28 May 2024 11:20:14 -0400 Subject: [PATCH] Add `working_dir` to `run hang analyzer` evergreen task; add correct preconditions --- evergreen/config.yml | 15 +++------------ evergreen/hang_analyzer/requirements.txt | 1 + 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/evergreen/config.yml b/evergreen/config.yml index 950168e085e..1a35d53b51d 100644 --- a/evergreen/config.yml +++ b/evergreen/config.yml @@ -515,15 +515,16 @@ functions: set -o verbose TOP_DIR=$(pwd) + HANG_ANALYZER_PATH=$TOP_DIR/evergreen/hang_analyzer REQUIREMENTS_PATH=$HANG_ANALYZER_PATH/requirements.txt - if [[ ! -d $TOP_DIR || ! -d $REQUIREMENTS_PATH ]]; then + if [[ ! -d $TOP_DIR || ! -f $REQUIREMENTS_PATH ]]; then echo "No source directory exists. Not running hang analyzer" exit 1 fi - mkdir realm-core/hang_analyzer_workdir; cd realm-core/hang_analyzer_workdir + mkdir hang_analyzer_workdir; cd hang_analyzer_workdir ${python3|python3} -m venv venv # venv creates its Scripts/activate file with CLRF endings, which @@ -549,16 +550,6 @@ functions: echo "python set to $(which $python)" - 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" "wheel==0.37.0" || exit 1 - if [ "Windows_NT" = "$OS" ]; then REQUIREMENTS_PATH=$(cygpath -w $REQUIREMENTS_PATH) fi diff --git a/evergreen/hang_analyzer/requirements.txt b/evergreen/hang_analyzer/requirements.txt index 063f5a911a0..a6a9bc8b5a9 100644 --- a/evergreen/hang_analyzer/requirements.txt +++ b/evergreen/hang_analyzer/requirements.txt @@ -1,3 +1,4 @@ pypiwin32==223; sys_platform == "win32" and python_version > "3" pywin32==301; sys_platform == "win32" and python_version > "3" distro == 1.5.0 +setuptools == 70.0.0