Skip to content

Commit 1a05fd4

Browse files
committed
fix merge
1 parent c19673f commit 1a05fd4

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

.evergreen/scripts/install-dependencies.sh

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
#!/bin/bash
22

33
set -eu
4-
<<<<<<< HEAD
5-
file="$PROJECT_DIRECTORY/.evergreen/install-dependencies.sh"
6-
# Don't use ${file} syntax here because evergreen treats it as an empty expansion.
7-
[ -f "$file" ] && bash "$file"
8-
||||||| 86084adb2
9-
file="$PROJECT_DIRECTORY/.evergreen/install-dependencies.sh"
10-
# Don't use ${file} syntax here because evergreen treats it as an empty expansion.
11-
[ -f "$file" ] && bash "$file" || echo "$file not available, skipping"
12-
=======
134

145
# On Evergreen jobs, "CI" will be set, and we don't want to write to $HOME.
156
if [ "${CI:-}" == "true" ]; then
@@ -49,4 +40,16 @@ if ! command -v just 2>/dev/null; then
4940
fi
5041
echo "Installing just... done."
5142
fi
52-
>>>>>>> 2235b8354cef0acc0b41321fc103d14acf0ef92f
43+
44+
# Install uv.
45+
if ! command -v uv 2>/dev/null; then
46+
echo "Installing uv..."
47+
# On most systems we can install directly.
48+
_curl https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$_BIN_DIR" INSTALLER_NO_MODIFY_PATH=1 sh || {
49+
_pip_install uv uv
50+
}
51+
if ! command -v uv 2>/dev/null; then
52+
export PATH="$PATH:$_BIN_DIR"
53+
fi
54+
echo "Installing uv... done."
55+
fi

0 commit comments

Comments
 (0)