Skip to content

CXX-2685 Add 6.0 and 7.0 to EVG server version matrix #989

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.

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 3 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .mci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ variables:

mongodb_version:
version_latest: &version_latest "latest"
version_70: &version_70 "7.0"
version_60: &version_60 "6.0"
version_50: &version_50 "5.0"
version_44: &version_44 "4.4"
Expand Down Expand Up @@ -1167,6 +1168,14 @@ axes:
display_name: "Latest"
variables:
mongodb_version: *version_latest
- id: "7.0"
display_name: "7.0"
variables:
mongodb_version: *version_70
- id: "6.0"
display_name: "6.0"
variables:
mongodb_version: *version_60
- id: "5.0"
display_name: "5.0"
variables:
Expand Down
2 changes: 1 addition & 1 deletion examples/mongocxx/mongodb.com/documentation_examples.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1617,7 +1617,7 @@ int main() {
snapshot_example2(conn);
}
if (should_run_client_side_encryption_test() && is_replica_set(conn) &&
version_at_least(db, 6)) {
version_at_least(db, 7)) {
queryable_encryption_api(conn);
}
} catch (const std::logic_error& e) {
Expand Down
4 changes: 2 additions & 2 deletions src/mongocxx/test/client_side_encryption.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2501,12 +2501,12 @@ TEST_CASE("Create Encrypted Collection", "[client_side_encryption]") {
}

if (!test_util::newer_than(conn, "7.0")) {
std::cerr << "Explicit Encryption tests require MongoDB server 7.0+." << std::endl;
WARN("Explicit Encryption tests require MongoDB server 7.0+.");
return;
}

if (test_util::get_topology(conn) == "single") {
std::cerr << "Explicit Encryption tests must not run against a standalone." << std::endl;
WARN("Explicit Encryption tests must not run against a standalone.");
return;
}

Expand Down