Skip to content

Commit 03a7e91

Browse files
committed
more debug
1 parent c6ef95d commit 03a7e91

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

.evergreen/scripts/configure-env.sh

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,7 @@ CARGO_HOME=${CARGO_HOME:-${DRIVERS_TOOLS}/.cargo}
1717
UV_TOOL_DIR=$PROJECT_DIRECTORY/.local/uv/tools
1818
UV_CACHE_DIR=$PROJECT_DIRECTORY/.local/uv/cache
1919

20-
# On Evergreen jobs, "CI" will be set, and we don't want to write to $HOME.
21-
if [ "${CI:-}" == "true" ]; then
22-
echo "1, 2${CI:-}2"
23-
PYMONGO_BIN_DIR=${DRIVERS_TOOLS_BINARIES:-}
24-
elif [ "Windows_NT" = "${OS:-}" ]; then
25-
echo "2"
26-
PYMONGO_BIN_DIR=$HOME/cli_bin
27-
else
28-
echo "3"
29-
PYMONGO_BIN_DIR=""
30-
fi
31-
echo "HI: $PYMONGO_BIN_DIR, $CI"
32-
exit 1
20+
3321
# Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
3422
if [ "Windows_NT" = "${OS:-}" ]; then # Magic variable in cygwin
3523
DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
@@ -51,7 +39,6 @@ fi
5139
MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
5240
DRIVERS_TOOLS_BINARIES="$DRIVERS_TOOLS/.bin"
5341
MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
54-
PATH="$MONGODB_BINARIES:$DRIVERS_TOOLS_BINARIES:$PYMONGO_BIN_DIR:$PATH"
5542

5643
cat <<EOT > "$SCRIPT_DIR"/env.sh
5744
export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
@@ -83,7 +70,7 @@ export PYMONGO_BIN_DIR="$PYMONGO_BIN_DIR"
8370
export UV_TOOL_DIR="$UV_TOOL_DIR"
8471
export UV_CACHE_DIR="$UV_CACHE_DIR"
8572
export UV_TOOL_BIN_DIR="$DRIVERS_TOOLS_BINARIES"
86-
export PATH="$PATH"
73+
export PATH="$MONGODB_BINARIES:$DRIVERS_TOOLS_BINARIES:$PATH"
8774
# shellcheck disable=SC2154
8875
export PROJECT="${project:-mongo-python-driver}"
8976
export PIP_QUIET=1

.evergreen/scripts/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
_BIN_DIR=${PYMONGO_BIN_DIR:-}
5+
_BIN_DIR=${DRIVERS_TOOLS_BINARIES:-}
66

77
# Helper function to pip install a dependency using a temporary python env.
88
function _pip_install() {

0 commit comments

Comments
 (0)