Merge branch 'master' into merge-v1.19-into-master-1720007170469

Author: alcaeus

.evergreen/compile-unix.sh

@@ -65,19 +65,21 @@ esac
 # Report the current PHP version
 echo "PHP: `php --version | head -n 1`"
 
-# If we're testing a specific version of libmongoc, update submodule sources
+# If we're testing a specific version of libmongoc, update submodule sources and version
 if [ -n "$LIBMONGOC_VERSION" ]; then
+   echo "Finding Python3 binary..."
+   PYTHON="$(bash -c ". $DRIVERS_TOOLS/.evergreen/find-python3.sh && find_python3 2>/dev/null")"
+   echo "Finding Python3 binary... done."
+
    php scripts/update-submodule-sources.php
+
+   # We invoke python manually as it may not be in the path
+   pushd src/libmongoc/
+   $PYTHON build/calc_release_version.py > ../LIBMONGOC_VERSION_CURRENT
+   popd
 fi
 
 phpize
 ./configure --enable-mongodb-developer-flags
 
-# configure relies on version information in libmongoc-version-current, but the target is not available until after calling configure
-# To work around this, run the make target, then run configure again
-if [ -n "$LIBMONGOC_VERSION" ]; then
-   make libmongoc-version-current
-  ./configure --enable-mongodb-developer-flags
-fi
-
 make test TESTS="tests/smoketest.phpt"

.evergreen/config.yml

@@ -75,6 +75,7 @@ include:
   - filename: .evergreen/config/generated/build/build-libmongoc-8.3.yml
   - filename: .evergreen/config/generated/test/local-latest.yml
   - filename: .evergreen/config/generated/test/local-rapid.yml
+  - filename: .evergreen/config/generated/test/local-8.0.yml
   - filename: .evergreen/config/generated/test/local-7.0.yml
   - filename: .evergreen/config/generated/test/local-6.0.yml
   - filename: .evergreen/config/generated/test/local-5.0.yml
@@ -84,22 +85,26 @@ include:
   - filename: .evergreen/config/generated/test/local-3.6.yml
   - filename: .evergreen/config/generated/test/load-balanced-latest.yml
   - filename: .evergreen/config/generated/test/load-balanced-rapid.yml
+  - filename: .evergreen/config/generated/test/load-balanced-8.0.yml
   - filename: .evergreen/config/generated/test/load-balanced-7.0.yml
   - filename: .evergreen/config/generated/test/load-balanced-6.0.yml
   - filename: .evergreen/config/generated/test/load-balanced-5.0.yml
   - filename: .evergreen/config/generated/test/ocsp-latest.yml
   - filename: .evergreen/config/generated/test/ocsp-rapid.yml
+  - filename: .evergreen/config/generated/test/ocsp-8.0.yml
   - filename: .evergreen/config/generated/test/ocsp-7.0.yml
   - filename: .evergreen/config/generated/test/ocsp-6.0.yml
   - filename: .evergreen/config/generated/test/ocsp-5.0.yml
   - filename: .evergreen/config/generated/test/ocsp-4.4.yml
   - filename: .evergreen/config/generated/test/require-api-version-latest.yml
   - filename: .evergreen/config/generated/test/require-api-version-rapid.yml
+  - filename: .evergreen/config/generated/test/require-api-version-8.0.yml
   - filename: .evergreen/config/generated/test/require-api-version-7.0.yml
   - filename: .evergreen/config/generated/test/require-api-version-6.0.yml
   - filename: .evergreen/config/generated/test/require-api-version-5.0.yml
   - filename: .evergreen/config/generated/test/skip-crypt-shared-latest.yml
   - filename: .evergreen/config/generated/test/skip-crypt-shared-rapid.yml
+  - filename: .evergreen/config/generated/test/skip-crypt-shared-8.0.yml
   - filename: .evergreen/config/generated/test/skip-crypt-shared-7.0.yml
   - filename: .evergreen/config/generated/test/skip-crypt-shared-6.0.yml
   - filename: .evergreen/config/generated/test-variant/full-php-8.3.yml

.evergreen/config/build-variants.yml

@@ -3,13 +3,19 @@
 #
 buildvariants:
   # Debian
+  - name: build-debian12
+    display_name: "Build: Debian 12"
+    tags: ["build", "debian", "x64", "pr", "tag"]
+    run_on: debian12-small
+    tasks:
+      - name: "build-php-openssl3"
+      - name: "build-php-libmongoc"
   - name: build-debian11
     display_name: "Build: Debian 11"
     tags: ["build", "debian", "x64", "pr", "tag"]
     run_on: debian11-small
     tasks:
       - name: "build-all-php"
-      - name: "build-php-libmongoc"
   - name: build-debian10
     display_name: "Build: Debian 10"
     tags: ["build", "debian", "x64", "pr", "tag"]

.evergreen/config/functions.yml

@@ -210,7 +210,6 @@ functions:
       params:
         include_expansions_in_env:
           - API_VERSION
-          - ATLAS_CONNECTIVITY_URIS
           - CRYPT_SHARED_LIB_PATH
           - MONGODB_URI
           - APPEND_URI

.evergreen/config/generate-config.php

@@ -2,18 +2,22 @@
 <?php
 
 // Supported PHP versions. Add new versions to the beginning of the list
-$supportedPhpVersions = [
+$modernPhpVersions = [
     '8.3',
     '8.2',
     '8.1',
+];
+$legacyPhpVersions = [
     '8.0',
     '7.4',
 ];
+$supportedPhpVersions = array_merge($modernPhpVersions, $legacyPhpVersions);
 
 // Supported MongoDB versions. Add new versions after "rapid"
 $supportedMongoDBVersions = [
     'latest',
     'rapid',
+    '8.0',
     '7.0',
     '6.0',
     '5.0',
@@ -65,7 +69,8 @@
 $allFiles[] = generateConfigs('test', 'mongodbVersion', 'skip-crypt-shared.yml', 'skip-crypt-shared-%s', $skipCryptSharedServerVersions);
 
 // Test variants
-$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'full.yml', 'full-php-%s', $supportedPhpVersions);
+$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'modern-php-full.yml', 'full-php-%s', $modernPhpVersions);
+$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'legacy-php-full.yml', 'full-php-%s', $legacyPhpVersions);
 $allFiles[] = generateConfigs('test-variant', 'phpVersion', 'libmongoc.yml', 'libmongoc-php-%s', [$latestPhpVersion]);
 
 echo "Generated config. Use the following list to import files:\n";