Merge v1.x into v2.x (#1724)

Author: alcaeus

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

@@ -11,17 +11,28 @@ task_groups:
   # Builds all versions of PHP
   - name: "build-all-php"
     # Keep this number in sync with the number of PHP versions to allow for parallel builds
-    max_hosts: 3
+    max_hosts: 4
     setup_task: *build_setup
     setup_task_can_fail_task: true
     setup_task_timeout_secs: 1800
     teardown_task: *build_teardown
     tasks:
       - ".build"
 
+  # TODO: Remove task group once PHP 8.4 is available on PPC and Zseries
+  - name: "build-all-php-except-8.4"
+    # Keep this number in sync with the number of PHP versions to allow for parallel builds
+    max_hosts: 4
+    setup_task: *build_setup
+    setup_task_can_fail_task: true
+    setup_task_timeout_secs: 1800
+    teardown_task: *build_teardown
+    tasks:
+      - ".build !.php8.4"
+
   - name: "build-php-libmongoc"
     # Keep this in sync with the actual number of libmongoc builds (typically 3) defined in _template-build-libmongoc.yml
-    max_hosts: 3
+    max_hosts: 4
     setup_task: *build_setup
     setup_task_can_fail_task: true
     setup_task_timeout_secs: 1800

.evergreen/config/build-variants.yml

@@ -29,7 +29,8 @@ buildvariants:
     tags: ["build", "rhel", "zseries", "tag"]
     run_on: rhel8-zseries-small
     tasks:
-      - name: "build-all-php"
+      # TODO: Re-enable PHP 8.4 once it's available on PPC and Zseries
+      - name: "build-all-php-except-8.4"
   - name: build-rhel8-arm64
     display_name: "Build: RHEL 8 ARM64"
     tags: ["build", "rhel", "arm64", "tag"]
@@ -41,7 +42,8 @@ buildvariants:
     tags: ["build", "rhel", "power8", "tag"]
     run_on: rhel8-power-large
     tasks:
-      - name: "build-all-php"
+      # TODO: Re-enable PHP 8.4 once it's available on PPC and Zseries
+      - name: "build-all-php-except-8.4"
   - name: build-rhel8
     display_name: "Build: RHEL 8 x64"
     tags: ["build", "rhel", "x64", "pr", "tag"]

.evergreen/config/generate-config.php

@@ -3,6 +3,7 @@
 
 // Supported PHP versions. Add new versions to the beginning of the list
 $phpVersions = [
+    '8.4',
     '8.3',
     '8.2',
     '8.1',
@@ -21,7 +22,9 @@
     '4.0',
 ];
 
-$latestPhpVersion = max($phpVersions);
+// TODO: Change when PHP 8.4 is stable
+// $latestPhpVersion = max($phpVersions);
+$latestPhpVersion = '8.3';
 
 // Only test the latest PHP version for libmongoc
 $libmongocBuildPhpVersions = [ $latestPhpVersion ];
@@ -106,4 +109,3 @@ function generateConfigs(
 
     return '.evergreen/config' . $filename;
 }
-

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

@@ -120,7 +120,7 @@ jobs:
             "7.4")
               COMPILER="vc15"
               ;;
-            "8.0" | "8.1" | "8.2")
+            "8.0" | "8.1" | "8.2" | "8.3")
               COMPILER="vs16"
               ;;
             "8.4")