Skip to content

Commit 384d312

Browse files
committed
Merge branch 'v1.x' into merge-v1.20-into-v1.x-1728918109108
* v1.x: PHPC-2460: Use zend_zval_type_name instead of internal macros (#1714) PHPC-2464: Emit deprecation notice for negative "limit" Query option (#1710) PHPC-2458: Deprecate float arg for UTCDateTime constructor (#1695) Document how to run part of the test suite (#1690) Bump version to 1.21-dev (#1661) Update branch names for GHA workflows (#1646) PHPC-2343: Require PHP 8.1 (#1631)
2 parents 1766af8 + adecfba commit 384d312

File tree

217 files changed

+518
-3228
lines changed

Some content is hidden

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

217 files changed

+518
-3228
lines changed

.evergreen/architecture.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ initialisation. If a build step fails, test tasks are skipped for that platform
1515

1616
Build tasks are generated automatically and included in the main config file. The `build-variants.yml` file contains
1717
the list of supported platforms that the extension is built for. `build-task-groups.yml` defines the task groups that
18-
contain the build tasks. Note there is a separate task that skips PHP 7.4 and 8.0, as these versions do not support
19-
OpenSSL 3 (currently used on RHEL 9+ and Ubuntu 22.04+).
18+
contain the build tasks.
2019

2120
## Build Step 2: Run Tests
2221

.evergreen/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,5 @@ include:
7474
- filename: .evergreen/config/generated/test/ocsp.yml
7575
- filename: .evergreen/config/generated/test/require-api-version.yml
7676
- filename: .evergreen/config/generated/test/skip-crypt-shared.yml
77-
- filename: .evergreen/config/generated/test-variant/modern-php-full.yml
78-
- filename: .evergreen/config/generated/test-variant/legacy-php-full.yml
77+
- filename: .evergreen/config/generated/test-variant/php-full.yml
7978
- filename: .evergreen/config/generated/test-variant/libmongoc.yml

.evergreen/config/build-task-groups.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,9 @@ task_groups:
3030
tasks:
3131
- ".build !.php8.4"
3232

33-
# Builds all versions of PHP that support OpenSSL 3 (PHP 8.1+)
34-
- name: "build-php-openssl3"
35-
# Keep this number in sync with the number of PHP versions to allow for parallel builds
36-
# Subtract 2 versions as PHP 7.4 and 8.0 are not built with OpenSSL 3
37-
max_hosts: 2
38-
setup_task: *build_setup
39-
setup_task_can_fail_task: true
40-
setup_task_timeout_secs: 1800
41-
teardown_task: *build_teardown
42-
tasks:
43-
- ".build !.php7.4 !.php8.0"
44-
4533
- name: "build-php-libmongoc"
4634
# Keep this in sync with the actual number of libmongoc builds (typically 3) defined in _template-build-libmongoc.yml
47-
max_hosts: 3
35+
max_hosts: 4
4836
setup_task: *build_setup
4937
setup_task_can_fail_task: true
5038
setup_task_timeout_secs: 1800

.evergreen/config/build-variants.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildvariants:
88
tags: ["build", "debian", "x64", "pr", "tag"]
99
run_on: debian12-small
1010
tasks:
11-
- name: "build-php-openssl3"
11+
- name: "build-all-php"
1212
- name: "build-php-libmongoc"
1313
- name: build-debian11
1414
display_name: "Build: Debian 11"
@@ -23,7 +23,7 @@ buildvariants:
2323
tags: ["build", "rhel", "x64", "pr", "tag"]
2424
run_on: rhel90-small
2525
tasks:
26-
- name: "build-php-openssl3"
26+
- name: "build-all-php"
2727
- name: build-rhel8-zseries
2828
display_name: "Build: RHEL 8 Zseries"
2929
tags: ["build", "rhel", "zseries", "tag"]
@@ -57,13 +57,13 @@ buildvariants:
5757
tags: ["build", "ubuntu", "x64", "pr", "tag"]
5858
run_on: ubuntu2204-small
5959
tasks:
60-
- name: "build-php-openssl3"
60+
- name: "build-all-php"
6161
- name: build-ubuntu2204-arm64
6262
display_name: "Build: Ubuntu 22.04 ARM64"
6363
tags: ["build", "ubuntu", "arm64", "tag"]
6464
run_on: ubuntu2204-arm64-small
6565
tasks:
66-
- name: "build-php-openssl3"
66+
- name: "build-all-php"
6767
- name: build-ubuntu2004
6868
display_name: "Build: Ubuntu 20.04 x64"
6969
tags: ["build", "ubuntu", "x64", "tag"]

.evergreen/config/generate-config.php

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
<?php
33

44
// Supported PHP versions. Add new versions to the beginning of the list
5-
$modernPhpVersions = [
5+
$phpVersions = [
66
'8.4',
77
'8.3',
88
'8.2',
99
'8.1',
1010
];
11-
$legacyPhpVersions = [
12-
'8.0',
13-
'7.4',
14-
];
15-
$supportedPhpVersions = array_merge($modernPhpVersions, $legacyPhpVersions);
1611

1712
// Supported MongoDB versions. Add new versions after "rapid"
1813
$supportedMongoDBVersions = [
@@ -28,7 +23,7 @@
2823
];
2924

3025
// TODO: Change when PHP 8.4 is stable
31-
// $latestPhpVersion = max($supportedPhpVersions);
26+
// $latestPhpVersion = max($phpVersions);
3227
$latestPhpVersion = '8.3';
3328

3429
// Only test the latest PHP version for libmongoc
@@ -60,7 +55,7 @@
6055
$allFiles = [];
6156

6257
// Build tasks
63-
$allFiles[] = generateConfigs('tasks', 'build', 'phpVersion', 'build-php.yml', $supportedPhpVersions);
58+
$allFiles[] = generateConfigs('tasks', 'build', 'phpVersion', 'build-php.yml', $phpVersions);
6459
$allFiles[] = generateConfigs('tasks', 'build', 'phpVersion', 'build-libmongoc.yml', $libmongocBuildPhpVersions);
6560

6661
// Test tasks
@@ -71,8 +66,7 @@
7166
$allFiles[] = generateConfigs('tasks', 'test', 'mongodbVersion', 'skip-crypt-shared.yml', $skipCryptSharedServerVersions);
7267

7368
// Test variants
74-
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $modernPhpVersions);
75-
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'legacy-php-full.yml', $legacyPhpVersions);
69+
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'php-full.yml', $phpVersions);
7670
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'libmongoc.yml', [$latestPhpVersion]);
7771

7872
echo "Generated config. Use the following list to import files:\n";

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

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

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

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

.evergreen/config/generated/test-variant/modern-php-full.yml renamed to .evergreen/config/generated/test-variant/php-full.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/templates/test-variant/legacy-php-full.yml

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

.github/actions/windows/prepare-build/action.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,6 @@ outputs:
1717
runs:
1818
using: composite
1919
steps:
20-
# Reinstall VC15 (Visual Studio 2017) for PHP 7.4 using a derivation of the
21-
# script suggested in https://github.com/actions/runner-images/issues/9701
22-
- name: Install VC15 component for PHP 7.4
23-
if: ${{ inputs.version == '7.4' }}
24-
shell: pwsh
25-
run: |
26-
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
27-
$installPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
28-
$component = "Microsoft.VisualStudio.Component.VC.v141.x86.x64"
29-
$args = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$installPath`"", '--add', $component, '--quiet', '--norestart', '--nocache')
30-
$process = Start-Process -FilePath cmd.exe -ArgumentList $args -Wait -PassThru -WindowStyle Hidden
31-
3220
- name: Setup PHP SDK
3321
id: setup-php
3422

.github/workflows/arginfo-files.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ on:
44
pull_request:
55
branches:
66
- "v*.*"
7-
- "master"
87
- "feature/*"
98
push:
109
branches:
1110
- "v*.*"
12-
- "master"
1311
- "feature/*"
1412

1513
env:

.github/workflows/clang-format.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ on:
44
pull_request:
55
branches:
66
- "v*.*"
7-
- "master"
87
- "feature/*"
98
push:
109
branches:
1110
- "v*.*"
12-
- "master"
1311
- "feature/*"
1412

1513
env:
16-
PHP_VERSION: "7.4"
14+
PHP_VERSION: "8.1"
1715

1816
jobs:
1917
coding-standards:

.github/workflows/composer-validate.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ on:
44
pull_request:
55
branches:
66
- "v*.*"
7-
- "master"
87
- "feature/*"
98
push:
109
branches:
1110
- "v*.*"
12-
- "master"
1311
- "feature/*"
1412

1513
jobs:

.github/workflows/merge-up.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Merge up
33
on:
44
push:
55
branches:
6-
- "v[0-9]+.[0-9]+"
6+
- "v[0-9]+.[0-9x]+"
77

88
env:
99
GH_TOKEN: ${{ secrets.MERGE_UP_TOKEN }}

0 commit comments

Comments
 (0)