Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2bdc0c4

Browse files
authored
Merge branch 'v2.x' into merge-v1.x-into-v2.x-1742564546647
2 parents 85bf84c + f241cb5 commit 2bdc0c4

File tree

154 files changed

+1086
-3778
lines changed

Some content is hidden

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

154 files changed

+1086
-3778
lines changed

‎.evergreen/config.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,3 @@ include:
7171
- filename: .evergreen/config/generated/test/require-api-version.yml
7272
- filename: .evergreen/config/generated/test/csfle.yml
7373
- filename: .evergreen/config/generated/test-variant/modern-php-full.yml
74-
- filename: .evergreen/config/generated/test-variant/phpc.yml
75-
- filename: .evergreen/config/generated/test-variant/lowest.yml

‎.evergreen/config/generate-config.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@
5858

5959
// Test variants
6060
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $supportedPhpVersions);
61-
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
62-
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
61+
// TODO: Re-enable when 2.0.0 is released
62+
// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
63+
// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
6364

6465
echo "Generated config. Use the following list to import files:\n";
6566
echo implode("\n", array_map('getImportConfig', $allFiles)) . "\n";

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

Lines changed: 140 additions & 124 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: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /