Skip to content

CDRIVER-4394 Fix libmongocrypt branch in compile-test-gcpkms.sh #1175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 10, 2023
Merged

CDRIVER-4394 Fix libmongocrypt branch in compile-test-gcpkms.sh #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40f715b
CDRIVER-4394 Fix libmongocrypt branch in compile-test-gcpkms.sh
eramongodb Jan 10, 2023
7e5b8f3
Make libmongocrypt clone command consistent
eramongodb Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .evergreen/compile-test-azurekms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ INSTALL_DIR=$ROOT/install
. .evergreen/find-cmake.sh
echo "Installing libmongocrypt ... begin"
# TODO(CDRIVER-4394) update to use libmongocrypt 1.7.0 once there is a stable 1.7.0 release.
git clone https://github.com/mongodb/libmongocrypt --branch 1.7.0-alpha1
git clone --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.7.0-alpha1
$CMAKE -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
-DBUILD_TESTING=OFF \
"-H$ROOT/libmongocrypt" \
Expand Down
5 changes: 3 additions & 2 deletions .evergreen/compile-test-gcpkms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ ROOT=$(pwd)
INSTALL_DIR=$ROOT/install
. .evergreen/find-cmake.sh
echo "Installing libmongocrypt ... begin"
git clone --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.6.0
# TODO(CDRIVER-4394) update to use libmongocrypt 1.7.0 once there is a stable 1.7.0 release.
git clone --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.7.0-alpha1
$CMAKE -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
-DBUILD_TESTING=OFF \
"-H$ROOT/libmongocrypt" \
Expand All @@ -29,4 +30,4 @@ $CMAKE \
-DCMAKE_PREFIX_PATH=$INSTALL_DIR \
.
$CMAKE --build . --target test-gcpkms
echo "Compile test-gcpkms ... end"
echo "Compile test-gcpkms ... end"
2 changes: 1 addition & 1 deletion .evergreen/compile-unix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ pkg-config --modversion libssl || true
if [ "$COMPILE_LIBMONGOCRYPT" = "ON" ]; then
# Build libmongocrypt, using the previously fetched installed source.
# TODO(CDRIVER-4394) update to use libmongocrypt 1.7.0 once there is a stable 1.7.0 release.
git clone https://github.com/mongodb/libmongocrypt --branch 1.7.0-alpha1
git clone --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.7.0-alpha1

mkdir libmongocrypt/cmake-build
cd libmongocrypt/cmake-build
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/compile-windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ fi
if [ "$COMPILE_LIBMONGOCRYPT" = "ON" ]; then
# Build libmongocrypt, using the previously fetched installed source.
# TODO(CDRIVER-4394) update to use libmongocrypt 1.7.0 once there is a stable 1.7.0 release.
git clone https://github.com/mongodb/libmongocrypt --branch 1.7.0-alpha1
git clone --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.7.0-alpha1
mkdir libmongocrypt/cmake-build
cd libmongocrypt/cmake-build
"$CMAKE" -G "$CC" "-DCMAKE_PREFIX_PATH=${INSTALL_DIR}/lib/cmake" -DENABLE_SHARED_BSON=ON -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" ../
Expand Down