Skip to content

Commit 9e9b082

Browse files
committed
Merge branch 'master' into merge-v1.19-into-master-1725431470349
* master: (22 commits) PHPC-2434: Add PHP 8.4 to GitHub Actions (#1625) PHPC-2421, PHPC-2428: Update bundled dependencies (#1622) Don't build libmongoc version in pull requests Use drivers-evergreen-tools for Windows testing (#1615) PHPC-1957 Add tests for out-of-range UTCDateTime values (#1614) PHPC-2286 Implement `UTCDateTime::toDateTimeImmutable` (#1611) PHPC-2414, PHPC-2415: Update wire versions for MongoDB 8.0 compatibility (#1610) PHPC-2349, PHPC-2411: Deprecate unused exception classes (#1608) Fix failing tests on x86 systems (#1609) PHPC-2347: Deprecate BSON functions (#1607) PHPC-1489: Deprecate integer readPreference constants (#1604) Fix version computation for libmongoc development versions (#1599) PHPC-2376: Test against MongoDB 8.0 (#1598) PHPC-2254: Relax server selection timeout error message pattern (#1587) PHPC-2401: Support QEv2 range protocol (#1583) PHPC-2398: Use server_id methods for libmongoc 1.28+ (#1582) PHPC-2395: Fetch Atlas connectivity URIs from AWS Secrets Manager (#1579) Merge v1.19 into master (#1578) Revert "Bump mongodb-labs/drivers-github-tools from 1 to 2 (#1568)" (#1571) Bump mongodb-labs/drivers-github-tools from 1 to 2 (#1568) ...
2 parents a2133a3 + 3d37eb5 commit 9e9b082

File tree

1,112 files changed

+3528
-11606
lines changed

Some content is hidden

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

1,112 files changed

+3528
-11606
lines changed

.evergreen/compile-unix.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,21 @@ esac
6565
# Report the current PHP version
6666
echo "PHP: `php --version | head -n 1`"
6767

68-
# If we're testing a specific version of libmongoc, update submodule sources
68+
# If we're testing a specific version of libmongoc, update submodule sources and version
6969
if [ -n "$LIBMONGOC_VERSION" ]; then
70+
echo "Finding Python3 binary..."
71+
PYTHON="$(bash -c ". $DRIVERS_TOOLS/.evergreen/find-python3.sh && find_python3 2>/dev/null")"
72+
echo "Finding Python3 binary... done."
73+
7074
php scripts/update-submodule-sources.php
75+
76+
# We invoke python manually as it may not be in the path
77+
pushd src/libmongoc/
78+
$PYTHON build/calc_release_version.py > ../LIBMONGOC_VERSION_CURRENT
79+
popd
7180
fi
7281

7382
phpize
7483
./configure --enable-mongodb-developer-flags
7584

76-
# configure relies on version information in libmongoc-version-current, but the target is not available until after calling configure
77-
# To work around this, run the make target, then run configure again
78-
if [ -n "$LIBMONGOC_VERSION" ]; then
79-
make libmongoc-version-current
80-
./configure --enable-mongodb-developer-flags
81-
fi
82-
8385
make test TESTS="tests/smoketest.phpt"

.evergreen/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ post:
2929
github_pr_aliases: &github_pr_aliases
3030
# Always test all builds for consistency
3131
- variant_tags: ["pr build"]
32-
task_tags: ["pr"]
32+
task_tags: ["pr !build-libmongoc"]
3333
# Run all tasks in PR variants for PHP 8.3 (excluding MongoDB latest)
3434
- variant_tags: ["pr php8.3"]
3535
task_tags: ["!latest"]
@@ -74,5 +74,6 @@ 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/full.yml
77+
- filename: .evergreen/config/generated/test-variant/modern-php-full.yml
78+
- filename: .evergreen/config/generated/test-variant/legacy-php-full.yml
7879
- filename: .evergreen/config/generated/test-variant/libmongoc.yml

.evergreen/config/build-variants.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33
#
44
buildvariants:
55
# Debian
6+
- name: build-debian12
7+
display_name: "Build: Debian 12"
8+
tags: ["build", "debian", "x64", "pr", "tag"]
9+
run_on: debian12-small
10+
tasks:
11+
- name: "build-php-openssl3"
12+
- name: "build-php-libmongoc"
613
- name: build-debian11
714
display_name: "Build: Debian 11"
815
tags: ["build", "debian", "x64", "pr", "tag"]
916
run_on: debian11-small
1017
tasks:
1118
- name: "build-all-php"
12-
- name: "build-php-libmongoc"
1319
- name: build-debian10
1420
display_name: "Build: Debian 10"
1521
tags: ["build", "debian", "x64", "pr", "tag"]

.evergreen/config/functions.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ functions:
210210
params:
211211
include_expansions_in_env:
212212
- API_VERSION
213-
- ATLAS_CONNECTIVITY_URIS
214213
- CRYPT_SHARED_LIB_PATH
215214
- MONGODB_URI
216215
- APPEND_URI

.evergreen/config/generate-config.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,28 @@
22
<?php
33

44
// Supported PHP versions. Add new versions to the beginning of the list
5-
$supportedPhpVersions = [
5+
$modernPhpVersions = [
66
'8.3',
77
'8.2',
88
'8.1',
9+
];
10+
$legacyPhpVersions = [
911
'8.0',
1012
'7.4',
1113
];
14+
$supportedPhpVersions = array_merge($modernPhpVersions, $legacyPhpVersions);
1215

1316
// Supported MongoDB versions. Add new versions after "rapid"
1417
$supportedMongoDBVersions = [
1518
'latest',
1619
'rapid',
20+
'8.0',
1721
'7.0',
1822
'6.0',
1923
'5.0',
2024
'4.4',
2125
'4.2',
2226
'4.0',
23-
'3.6',
2427
];
2528

2629
$latestPhpVersion = max($supportedPhpVersions);
@@ -65,7 +68,8 @@
6568
$allFiles[] = generateConfigs('tasks', 'test', 'mongodbVersion', 'skip-crypt-shared.yml', $skipCryptSharedServerVersions);
6669

6770
// Test variants
68-
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'full.yml', $supportedPhpVersions);
71+
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $modernPhpVersions);
72+
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'legacy-php-full.yml', $legacyPhpVersions);
6973
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'libmongoc.yml', [$latestPhpVersion]);
7074

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

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

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

0 commit comments

Comments
 (0)