.evergreen/config/build-variants.yml

@@ -15,18 +15,6 @@ buildvariants:
     run_on: debian11-small
     tasks:
       - name: "build-all-php"
-  - name: build-debian10
-    display_name: "Build: Debian 10"
-    tags: ["build", "debian", "x64", "pr", "tag"]
-    run_on: debian10-small
-    tasks:
-      - name: "build-all-php"
-  - name: build-debian92
-    display_name: "Build: Debian 9.2"
-    tags: ["build", "debian", "x64", "pr", "tag"]
-    run_on: debian92-small
-    tasks:
-      - name: "build-all-php"
 
   # RHEL
   - name: build-rhel90

.evergreen/config/functions.yml

@@ -84,19 +84,15 @@ functions:
         content_type: ${content_type|application/x-gzip}
         permissions: public-read
         local_file: ${build_id}.tar.gz
-        remote_file: mongo-php-driver/${build_variant}/${revision}/${task_name}/${version}.tar.gz
-        # TODO: Use separate folder for the library once it exists
-#        remote_file: ${project}/${build_variant}/${revision}/${task_name}/${version}.tar.gz
+        remote_file: mongo-php-driver/${build_variant}/${revision}/${task_name}/${version_id}.tar.gz
 
   "fetch extension":
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
         bucket: mciuploads
-        # TODO: Use separate folder for the library once it exists
-        remote_file: mongo-php-driver/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version}.tar.gz
-#        remote_file: ${project}/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version}.tar.gz
+        remote_file: mongo-php-driver/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version_id}.tar.gz
         local_file: build.tar.gz
     - command: archive.targz_extract
       params:
@@ -329,9 +325,9 @@ functions:
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          file="${PROJECT_DIRECTORY}/.evergreen/install-composer.sh"
-          # Don't use ${file} syntax here because evergreen treats it as an empty expansion.
-          [ -f "$file" ] && DEPENDENCIES=${DEPENDENCIES} bash $file || echo "$file not available, skipping"
+          DEPENDENCIES=${DEPENDENCIES} \
+          PHP_VERSION=${PHP_VERSION} \
+          bash ${PROJECT_DIRECTORY}/.evergreen/install-composer.sh
 
   "start load balancer":
     - command: shell.exec

.evergreen/config/generate-config.php

@@ -3,6 +3,7 @@
 
 // Supported PHP versions. Add new versions to the beginning of the list
 $modernPhpVersions = [
+    '8.4',
     '8.3',
     '8.2',
     '8.1',
@@ -13,7 +14,9 @@
 ];
 $supportedPhpVersions = array_merge($modernPhpVersions, $legacyPhpVersions);
 
-$latestPhpVersion = max($supportedPhpVersions);
+// TODO: use max() once PHP 8.4 is stable
+//$latestPhpVersion = max($supportedPhpVersions);
+$latestPhpVersion = '8.3';
 $lowestPhpVersion = min($supportedPhpVersions);
 
 // Supported MongoDB versions. Add new versions after "rapid"