Skip to content

Commit 7b97317

Browse files
committed
Merge branch 'v2.1' into merge-v1.21-into-v2.1-1755096084259
2 parents 75eb24a + 62a321e commit 7b97317

File tree

186 files changed

+2793
-3928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+2793
-3928
lines changed

.evergreen/config/generate-config.php

100644100755
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/env php
1+
#!/usr/bin/env php
22
<?php
33

44
// Supported PHP versions. Add new versions to the beginning of the list
@@ -9,9 +9,7 @@
99
'8.1',
1010
];
1111

12-
// TODO: use max() once PHP 8.4 is stable
13-
//$latestPhpVersion = max($supportedPhpVersions);
14-
$latestPhpVersion = '8.3';
12+
$latestPhpVersion = max($supportedPhpVersions);
1513
$lowestPhpVersion = min($supportedPhpVersions);
1614

1715
// Supported MongoDB versions. Add new versions after "rapid"
@@ -24,7 +22,6 @@
2422
'5.0',
2523
'4.4',
2624
'4.2',
27-
'4.0',
2825
];
2926

3027
// Server versions

.evergreen/config/generated/build/build-extension.yml

Lines changed: 32 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/lowest.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/modern-php-full.yml

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/phpc.yml

Lines changed: 28 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/local.yml

Lines changed: 0 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)