Merge v1.20 into v1.x (#1738)

Author: mongodb-php-bot

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

@@ -19,17 +19,6 @@ task_groups:
     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: 2

.evergreen/config/build-variants.yml

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