Merge v2.0 into v2.x (#1826)

Author: mongodb-php-bot

.evergreen/README.md

@@ -12,5 +12,5 @@ hosts.
 
 [mongodb-labs/drivers-evergreen-tools](https://github.com/mongodb-labs/drivers-evergreen-tools)
 consists of common scripts used by many drivers (e.g. starting
-[mongo-orchestration](https://github.com/10gen/mongo-orchestration)). The PHP
-driver clones this during the build process.
+[mongo-orchestration](https://github.com/10gen/mongo-orchestration)). This package is installed as a Git submodule
+in the `tests` directory.

.evergreen/config/functions.yml

@@ -4,7 +4,7 @@ functions:
     - command: git.get_project
       params:
         directory: "src"
-    # Fetch the libmongoc submodule
+    # Fetch the submodules
     - command: shell.exec
       params:
         working_dir: "src"
@@ -22,7 +22,7 @@ functions:
              CURRENT_VERSION=latest
           fi
           
-          export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
+          export DRIVERS_TOOLS="$(pwd)/tests/drivers-evergreen-tools"
           export PROJECT_DIRECTORY="$(pwd)"
           
           # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
@@ -72,15 +72,9 @@ functions:
   "prepare resources":
     - command: shell.exec
       params:
+        working_dir: src
         script: |
           ${PREPARE_SHELL}
-          rm -rf $DRIVERS_TOOLS
-          if [ "${project}" = "drivers-tools" ]; then
-            # If this was a patch build, doing a fresh clone would not actually test the patch
-            cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS
-          else
-            git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
-          fi
           echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
 
 
@@ -132,6 +126,9 @@ functions:
         script: |
           ${PREPARE_SHELL}
           perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" Makefile
+          for filename in $(find ${DRIVERS_TOOLS} -name \*.json); do
+            perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" $filename
+          done
 
   "compile driver" :
     - command: shell.exec

.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/tests/drivers-evergreen-tools"
+    schedule:
+      interval: "weekly"

.github/workflows/tests.yml

@@ -57,8 +57,9 @@ jobs:
         with:
           python-version: '3.13'
 
-      - id: setup-mongodb
-        uses: mongodb-labs/drivers-evergreen-tools@master
+      - name: Setup MongoDB
+        id: setup-mongodb
+        uses: ./tests/drivers-evergreen-tools
         with:
           version: ${{ matrix.mongodb-version }}
           topology: ${{ matrix.topology }}

.github/workflows/windows-tests.yml

@@ -64,8 +64,9 @@ jobs:
         with:
           submodules: true
 
-      - id: setup-mongodb
-        uses: mongodb-labs/drivers-evergreen-tools@master
+      - name: Setup MongoDB
+        id: setup-mongodb
+        uses: ./tests/drivers-evergreen-tools
         with:
           version: "7.0"
           topology: "server"

.gitmodules

@@ -6,3 +6,6 @@
 	path = src/libmongocrypt
 	url = https://github.com/mongodb/libmongocrypt.git
 	ignore = untracked
+[submodule "tests/drivers-evergreen-tools"]
+	path = tests/drivers-evergreen-tools
+	url = https://github.com/mongodb-labs/drivers-evergreen-tools.git