Skip to content

Commit 9f4c1c8

Browse files
Merge v1.20 into v1.x (#1452)
2 parents ec7b346 + 6428585 commit 9f4c1c8

File tree

11 files changed

+182
-142
lines changed

11 files changed

+182
-142
lines changed

.evergreen/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,5 @@ 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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@
5555

5656
// Test variants
5757
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $supportedPhpVersions);
58-
// TODO: Re-enable when 1.20.0 is released
59-
// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
60-
// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
58+
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
59+
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
6160

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

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

Lines changed: 84 additions & 96 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: 16 additions & 0 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: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,34 @@
55
vars:
66
PHP_VERSION: "%phpVersion%"
77
- func: "compile extension"
8-
# TODO: remove once 1.20.0 is released
8+
- func: "upload extension"
9+
- name: "build-php-%phpVersion%-lowest"
10+
tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
11+
commands:
12+
- func: "locate PHP binaries"
13+
vars:
14+
PHP_VERSION: "%phpVersion%"
15+
- func: "compile extension"
16+
vars:
17+
EXTENSION_VERSION: "1.20.0"
18+
- func: "upload extension"
19+
- name: "build-php-%phpVersion%-next-stable"
20+
tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
21+
commands:
22+
- func: "locate PHP binaries"
23+
vars:
24+
PHP_VERSION: "%phpVersion%"
25+
- func: "compile extension"
926
vars:
1027
EXTENSION_BRANCH: "v1.20"
1128
- func: "upload extension"
12-
# TODO: re-enable once 1.20.0 is released
13-
# - name: "build-php-%phpVersion%-lowest"
14-
# tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
15-
# commands:
16-
# - func: "locate PHP binaries"
17-
# vars:
18-
# PHP_VERSION: "%phpVersion%"
19-
# - func: "compile extension"
20-
# vars:
21-
# EXTENSION_VERSION: "1.20.0"
22-
# - func: "upload extension"
23-
# - name: "build-php-%phpVersion%-next-stable"
24-
# tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
25-
# commands:
26-
# - func: "locate PHP binaries"
27-
# vars:
28-
# PHP_VERSION: "%phpVersion%"
29-
# - func: "compile extension"
30-
# vars:
31-
# EXTENSION_BRANCH: "v1.20.0"
32-
# - func: "upload extension"
33-
# - name: "build-php-%phpVersion%-next-minor"
34-
# tags: ["build", "php%phpVersion%", "next-minor"]
35-
# commands:
36-
# - func: "locate PHP binaries"
37-
# vars:
38-
# PHP_VERSION: "%phpVersion%"
39-
# - func: "compile extension"
40-
# vars:
41-
# EXTENSION_BRANCH: "master"
42-
# - func: "upload extension"
29+
- name: "build-php-%phpVersion%-next-minor"
30+
tags: ["build", "php%phpVersion%", "next-minor"]
31+
commands:
32+
- func: "locate PHP binaries"
33+
vars:
34+
PHP_VERSION: "%phpVersion%"
35+
- func: "compile extension"
36+
vars:
37+
EXTENSION_BRANCH: "v1.x"
38+
- func: "upload extension"

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ on:
1313

1414
env:
1515
PHP_VERSION: "8.2"
16-
# TODO: change to "stable" once 1.20.0 is released
17-
# DRIVER_VERSION: "stable"
18-
DRIVER_VERSION: "mongodb/[email protected]"
16+
DRIVER_VERSION: "stable"
1917

2018
jobs:
2119
phpcs:

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ on:
1919

2020
env:
2121
PHP_VERSION: "8.2"
22-
# TODO: change to "stable" once 1.20.0 is released
23-
# DRIVER_VERSION: "stable"
24-
DRIVER_VERSION: "mongodb/[email protected]"
22+
DRIVER_VERSION: "stable"
2523

2624
jobs:
2725
psalm:

.github/workflows/tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ on:
1212
- "feature/*"
1313

1414
env:
15-
# TODO: change to "stable" once 1.20.0 is released
16-
# DRIVER_VERSION: "stable"
17-
DRIVER_VERSION: "mongodb/[email protected]"
15+
DRIVER_VERSION: "stable"
1816

1917
jobs:
2018
phpunit:

tests/Operation/FindFunctionalTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ function () use ($modifiers): void {
4848
['modifiers' => $modifiers],
4949
);
5050

51-
$operation->execute($this->getPrimaryServer());
51+
$this->assertDeprecated(
52+
fn () => $operation->execute($this->getPrimaryServer()),
53+
);
5254
},
5355
function (array $event) use ($expectedSort): void {
5456
$this->assertEquals($expectedSort, $event['started']->getCommand()->sort ?? null);

0 commit comments

Comments
 (0)