Skip to content

Commit 04e0343

Browse files
Merge v1.21 into v1.x (#1661)
2 parents 9e6948d + 7b7891e commit 04e0343

File tree

8 files changed

+14
-94
lines changed

8 files changed

+14
-94
lines changed

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

+8-40
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

-20
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

+2-10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
vars:
66
PHP_VERSION: "%phpVersion%"
77
- func: "compile extension"
8+
vars:
9+
EXTENSION_BRANCH: "v1.21"
810
- func: "upload extension"
911
- name: "build-php-%phpVersion%-lowest"
1012
tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
@@ -16,16 +18,6 @@
1618
vars:
1719
EXTENSION_VERSION: "1.21.0"
1820
- 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"
26-
vars:
27-
EXTENSION_BRANCH: "v1.21"
28-
- func: "upload extension"
2921
- name: "build-php-%phpVersion%-next-minor"
3022
tags: ["build", "php%phpVersion%", "next-minor"]
3123
commands:

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

-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,4 @@
11
# Variants with different PHPC versions
2-
- name: test-debian12-php-%phpVersion%-phpc-next-stable
3-
tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"]
4-
display_name: "Test: Debian 12, PHP %phpVersion%, PHPC next-stable"
5-
run_on: debian12-small
6-
expansions:
7-
FETCH_BUILD_VARIANT: "build-debian12"
8-
FETCH_BUILD_TASK: "build-php-%phpVersion%-next-stable"
9-
PHP_VERSION: "%phpVersion%"
10-
depends_on:
11-
- variant: "build-debian12"
12-
name: "build-php-%phpVersion%-next-stable"
13-
tasks:
14-
- ".standalone .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
15-
- ".replicaset .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
16-
- ".sharded .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
17-
- ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
18-
- "test_serverless_task_group"
19-
- "test_serverless_proxy_task_group"
20-
- "test-atlas-data-lake"
21-
222
- name: test-debian12-php-%phpVersion%-phpc-next-minor
233
tags: ["test", "debian", "x64", "php%phpVersion%"]
244
display_name: "Test: Debian 12, PHP %phpVersion%, PHPC next-minor"

.github/workflows/coding-standards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
env:
1515
PHP_VERSION: "8.2"
16-
DRIVER_VERSION: "stable"
16+
DRIVER_VERSION: "mongodb/[email protected]"
1717

1818
jobs:
1919
phpcs:

.github/workflows/generator.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
env:
1515
PHP_VERSION: "8.2"
16-
DRIVER_VERSION: "stable"
16+
DRIVER_VERSION: "mongodb/[email protected]"
1717

1818
jobs:
1919
psalm:

.github/workflows/static-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
env:
2121
PHP_VERSION: "8.2"
22-
DRIVER_VERSION: "stable"
22+
DRIVER_VERSION: "mongodb/[email protected]"
2323

2424
jobs:
2525
psalm:

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- "feature/*"
1313

1414
env:
15-
DRIVER_VERSION: "stable"
15+
DRIVER_VERSION: "mongodb/[email protected]"
1616

1717
jobs:
1818
phpunit:

0 commit comments

Comments
 (0)