Merge branch 'v2.x' into merge-v2.1-into-v2.x-1769595501524

* v2.x: (40 commits)
  PHPC-2664: Drop Windows x86 builds (#1911)
  Bump tests/drivers-evergreen-tools from `61cb4e9` to `5514d6a` (#1908)
  Bump tests/drivers-evergreen-tools from `514927f` to `61cb4e9` (#1906)
  Bump tests/drivers-evergreen-tools from `ebe98d0` to `514927f` (#1905)
  PHPC-2649: Update to libmongocrypt 1.17.0 (#1904)
  PHPC-2654: Update to libmongoc 2.2.1 (#1900)
  Bump tests/drivers-evergreen-tools from `c92d062` to `ebe98d0` (#1903)
  Bump actions/cache from 4 to 5 (#1902)
  Bump tests/drivers-evergreen-tools from `c83e428` to `c92d062` (#1899)
  Bump tests/drivers-evergreen-tools from `cb019f7` to `c83e428` (#1898)
  Bump actions/checkout from 5 to 6 (#1895)
  Bump tests/drivers-evergreen-tools from `f8ab2a5` to `cb019f7` (#1896)
  PHPC-2634: Binary vector corpus tests (#1892)
  Bump tests/drivers-evergreen-tools from `1dcbfe4` to `f8ab2a5` (#1891)
  PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 (#1868)
  Fix git submodule command in CONTRIBUTING.md
  PHPC-2627: Use appropriate return type for zend_object_iterator_funcs.valid (#1890)
  Bump github/codeql-action from 3 to 4 (#1889)
  Bump tests/drivers-evergreen-tools from `3b3f081` to `1dcbfe4` (#1878)
  PHPC-2474: Support Binary vector subtype (#1853)
  ...

Author: alcaeus

.evergreen/compile-unix.sh

@@ -72,11 +72,6 @@ if [ -n "$LIBMONGOC_VERSION" ]; then
    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

.evergreen/config/functions.yml

@@ -140,7 +140,6 @@ functions:
              echo "Checking out libmongoc version: ${LIBMONGOC_VERSION}"
              git fetch
              git checkout ${LIBMONGOC_VERSION}
-             # Note: compile-unix.sh will run `make libmongoc-version-current`
           fi
     - command: subprocess.exec
       type: test
@@ -160,6 +159,26 @@ functions:
     - command: attach.results
       params:
         file_location: "${DRIVERS_TOOLS}/results.json"
+    - command: shell.exec
+      params:
+        working_dir: src
+        script: |
+          ${PREPARE_SHELL}
+          if [ -f test-results.xml ]; then
+            curl -Os https://cli.codecov.io/latest/linux/codecov
+            curl -Os https://cli.codecov.io/latest/linux/codecov.SHA256SUM
+            shasum -a 256 -c codecov.SHA256SUM
+            sudo chmod +x codecov
+            ./codecov upload-process \
+              --report-type test_results \
+              --disable-search \
+              --fail-on-error \
+              --token ${CODECOV_TOKEN} \
+              --flag "${MONGODB_VERSION}-${TOPOLOGY}" \
+              --file test-results.xml
+          else
+            echo "Skipping codecov test result upload"
+          fi
 
   "bootstrap mongo-orchestration":
     - command: shell.exec
@@ -177,6 +196,15 @@ functions:
           ${PREPARE_SHELL}
           SKIP_LEGACY_SHELL=true \
           bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+    - command: shell.exec
+      params:
+        include_expansions_in_env:
+          - MONGODB_VERSION
+          - TOPOLOGY
+        script: |
+          printf "\n" >> mo-expansion.yml
+          printf "MONGODB_VERSION: '%s'\n" "${MONGODB_VERSION}" >> mo-expansion.yml
+          printf "TOPOLOGY: '%s'\n" "${TOPOLOGY}" >> mo-expansion.yml
     # run-orchestration generates expansion file with MONGODB_URI and CRYPT_SHARED_LIB_PATH
     - command: expansions.update
       params:

.evergreen/config/generate-config.php

@@ -21,9 +21,7 @@
     '4.2',
 ];
 
-// TODO: Change when PHP 8.4 is stable
-// $latestPhpVersion = max($phpVersions);
-$latestPhpVersion = '8.3';
+$latestPhpVersion = max($phpVersions);
 
 // Only test the latest PHP version for libmongoc
 $libmongocBuildPhpVersions = [ $latestPhpVersion ];

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

@@ -10,7 +10,7 @@
       - func: "compile driver"
         vars:
           PHP_VERSION: "%phpVersion%"
-          LIBMONGOC_VERSION: "1.30.6"
+          LIBMONGOC_VERSION: "2.2.1"
       - func: "upload build"
 
   - name: "build-php-%phpVersion%-libmongoc-next-stable"
@@ -19,7 +19,7 @@
       - func: "compile driver"
         vars:
           PHP_VERSION: "%phpVersion%"
-          LIBMONGOC_VERSION: "r1.30"
+          LIBMONGOC_VERSION: "r2.2"
       - func: "upload build"
 
   - name: "build-php-%phpVersion%-libmongoc-latest"

.evergreen/config/generated/test-variant/libmongoc.yml

@@ -0,0 +1,55 @@
+name: "Build libmongoc"
+description: "Builds and install libmongoc"
+inputs:
+  prefix:
+    description: "Prefix to install libmongoc to"
+    default: "/usr/local"
+  version:
+    description: "Libmongoc version to build (major.minor)"
+    required: true
+runs:
+  using: composite
+
+  steps:
+    - name: Download libmongoc
+      shell: bash
+      working-directory: /tmp
+      run: wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/${LIBMONGOC_VERSION}.tar.gz" --output-document="mongo-c-driver.tar.gz"
+      env:
+        LIBMONGOC_VERSION: ${{ inputs.version }}
+
+    - name: Extract libmongoc
+      shell: bash
+      working-directory: /tmp
+      run: tar xf "mongo-c-driver.tar.gz"
+
+    - name: Configure cmake
+      shell: bash
+      working-directory: /tmp
+      run: |
+        cmake \
+          -S "mongo-c-driver-${LIBMONGOC_VERSION}" \
+          -B _build \
+          -D CMAKE_BUILD_TYPE=RelWithDebInfo \
+          -D BUILD_VERSION="${LIBMONGOC_VERSION}" \
+          -D ENABLE_MONGOC=ON \
+          -D ENABLE_TRACING=ON \
+          -D ENABLE_CLIENT_SIDE_ENCRYPTION=ON
+      env:
+        LIBMONGOC_VERSION: ${{ inputs.version }}
+
+    - name: Build libmongoc
+      shell: bash
+      working-directory: /tmp
+      run: cmake --build _build --config RelWithDebInfo --parallel
+
+    - name: Install libmongoc
+      shell: bash
+      working-directory: /tmp
+      run: sudo cmake --install _build --prefix "${PREFIX}" --config RelWithDebInfo
+      env:
+        PREFIX: ${{ inputs.prefix }}
+
+    - name: Check pkg-config availability
+      shell: bash
+      run: pkg-config --modversion mongoc2

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

@@ -0,0 +1,28 @@
+name: "Build libmongocrypt"
+description: "Installs libmongocrypt"
+inputs:
+  version:
+    description: "Libmongocrypt version to install (major.minor)"
+    required: true
+runs:
+  using: composite
+
+  steps:
+    - name: Add repository key
+      shell: bash
+      run: sudo sh -c 'curl -s --location https://pgp.mongodb.com/libmongocrypt.asc | gpg --dearmor >/etc/apt/trusted.gpg.d/libmongocrypt.gpg'
+
+    - name: Add repository
+      shell: bash
+      working-directory: /tmp
+      run: echo "deb https://libmongocrypt.s3.amazonaws.com/apt/ubuntu noble/libmongocrypt/${LIBMONGOCRYPT_VERSION} universe" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
+      env:
+        LIBMONGOCRYPT_VERSION: ${{ inputs.version }}
+
+    - name: Update apt sources
+      shell: bash
+      run: sudo apt-get update
+
+    - name: Install libmongocrypt
+      shell: bash
+      run: sudo apt-get install -y libmongocrypt-dev

.github/actions/linux/build-libmongoc/action.yml

@@ -4,6 +4,10 @@ inputs:
   version:
     description: "PHP version to build for"
     required: true
+  configureOpts:
+    description: "Extra options to use for the call to ./configure"
+    default: ""
+
 runs:
   using: composite
   steps:
@@ -17,6 +21,8 @@ runs:
     - name: "Configure driver"
       run: .github/workflows/configure.sh
       shell: bash
+      env:
+        CONFIGURE_OPTS: ${{ inputs.configureOpts }}
 
     - name: "Build driver"
       run: "make all"

.github/actions/linux/build-libmongocrypt/action.yml

@@ -4,9 +4,6 @@ inputs:
   php-version:
     description: "PHP version to build for"
     required: true
-  arch:
-    description: "The architecture to build for (x64 or x86)"
-    required: true
   ts:
     description: "Thread-safety (nts or ts)"
     required: true
@@ -21,7 +18,7 @@ runs:
       uses: php/php-windows-builder/extension@1.6.0
       with:
         php-version: ${{ inputs.php-version }}
-        arch: ${{ inputs.arch }}
+        arch: x64
         ts: ${{ inputs.ts }}
         run-tests: ${{ inputs.run-tests == 'true' && true || false }}
         test-runner-args: "--show-diff"