Skip to content

Commit 08f57db

Browse files
authored
Revert to using find-cmake-latest (#1025)
1 parent 569fea2 commit 08f57db

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

.evergreen/install_c_driver.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,10 @@ else
6363
echo "${build_version}" >|"${mongoc_dir}/VERSION_CURRENT"
6464
fi
6565

66-
# TODO: revert to using find-cmake-latest once `mongoc_version_minimum` contains commit 6a23bd37.
6766
# shellcheck source=/dev/null
68-
. "${mongoc_dir}/.evergreen/scripts/find-cmake-version.sh"
67+
. "${mongoc_dir}/.evergreen/scripts/find-cmake-latest.sh"
6968
declare cmake_binary
70-
cmake_binary="$(find_cmake_version 3 25 3)"
69+
cmake_binary="$(find_cmake_latest)"
7170
command -v "${cmake_binary:?}"
7271

7372
# Install libmongocrypt.

.mci.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -403,10 +403,9 @@ functions:
403403
MONGOC_PREFIX=$(cygpath -m "$MONGOC_PREFIX")
404404
fi
405405
406-
# TODO: revert to using find-cmake-latest once `mongoc_version_minimum` contains commit 6a23bd37.
407-
. "$MONGOC_PREFIX/.evergreen/scripts/find-cmake-version.sh"
406+
. "$MONGOC_PREFIX/.evergreen/scripts/find-cmake-latest.sh"
408407
export cmake_binary
409-
cmake_binary="$(find_cmake_version 3 25 3)"
408+
cmake_binary="$(find_cmake_latest)"
410409
command -v "$cmake_binary"
411410
412411
if [ ! -d ../drivers-evergreen-tools ]; then
@@ -717,10 +716,9 @@ functions:
717716
# is true.
718717
if [[ -z "$MONGODB_API_VERSION" ]]; then
719718
echo "Building example projects..."
720-
# TODO: revert to using find-cmake-latest once `mongoc_version_minimum` contains commit 6a23bd37.
721-
. "$PREFIX/.evergreen/scripts/find-cmake-version.sh"
719+
. "$PREFIX/.evergreen/scripts/find-cmake-latest.sh"
722720
export cmake_binary
723-
cmake_binary="$(find_cmake_version 3 25 3)"
721+
cmake_binary="$(find_cmake_latest)"
724722
command -v "$cmake_binary"
725723
.evergreen/build_example_projects.sh
726724
echo "Building example projects... done."
@@ -1117,10 +1115,10 @@ tasks:
11171115
[ -d mongo-c-driver ] || git clone --depth 1 https://github.com/mongodb/mongo-c-driver
11181116
rsync -aq --exclude='examples/add_subdirectory' $(readlink -f ../..) .
11191117
[ -d build ] || mkdir build
1120-
# TODO: revert to using find-cmake-latest once `mongoc_version_minimum` contains commit 6a23bd37.
1121-
. ./mongo-c-driver/.evergreen/scripts/find-cmake-version.sh
1118+
. ./mongo-c-driver/.evergreen/scripts/find-cmake-latest.sh
11221119
export CMAKE
1123-
CMAKE="$(find_cmake_version 3 25 3)"
1120+
CMAKE="$(find_cmake_latest)"
1121+
command -v "$CMAKE"
11241122
cd build
11251123
$CMAKE ..
11261124
$CMAKE --build . -- -j $(nproc)

0 commit comments

Comments
 (0)