Merge remote-tracking branch 'upstream/v2.x' into merge-v1.x-into-v2.…

…x-1737963978753
mongodb · Jan 27, 2025 · b5b5191 · b5b5191
2 parents fd8dd43 + 575d0aa
commit b5b5191
Show file tree

Hide file tree

Showing 151 changed files with 1,029 additions and 3,750 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -71,5 +71,3 @@ include:
   - filename: .evergreen/config/generated/test/require-api-version.yml
   - filename: .evergreen/config/generated/test/csfle.yml
   - filename: .evergreen/config/generated/test-variant/modern-php-full.yml
-  - filename: .evergreen/config/generated/test-variant/phpc.yml
-  - filename: .evergreen/config/generated/test-variant/lowest.yml
diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php
@@ -58,8 +58,9 @@
 
 // Test variants
 $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $supportedPhpVersions);
-$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
-$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
+// TODO: Re-enable when 2.0.0 is released
+// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
+// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
 
 echo "Generated config. Use the following list to import files:\n";
 echo implode("\n", array_map('getImportConfig', $allFiles)) . "\n";

diff --git a/.evergreen/config/generated/build/build-extension.yml b/.evergreen/config/generated/build/build-extension.yml
diff --git a/.evergreen/config/generated/test-variant/lowest.yml b/.evergreen/config/generated/test-variant/lowest.yml
diff --git a/.evergreen/config/generated/test-variant/phpc.yml b/.evergreen/config/generated/test-variant/phpc.yml