From e25fafa360d9d70274b4b479960d37b4da9634db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?=
 <jerome.tamarelle@mongodb.com>
Date: Mon, 10 Feb 2025 09:44:30 +0100
Subject: [PATCH 1/2] PHPLIB-1613 Load drivers-evergreen-tools using submodule
 (#1584)

---
 .evergreen/config/functions.yml | 13 ++++---------
 .github/workflows/tests.yml     |  7 ++++---
 .gitmodules                     |  3 +++
 tests/drivers-evergreen-tools   |  1 +
 4 files changed, 12 insertions(+), 12 deletions(-)
 create mode 160000 tests/drivers-evergreen-tools

diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml
index 34f7c3960..4fc2ba686 100644
--- a/.evergreen/config/functions.yml
+++ b/.evergreen/config/functions.yml
@@ -4,7 +4,7 @@ functions:
     - command: git.get_project
       params:
         directory: "src"
-    # Make an evergreen exapanstion file with dynamic values
+    # Make an evergreen expansion file with dynamic values
     - command: shell.exec
       params:
         working_dir: "src"
@@ -16,7 +16,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
@@ -111,15 +111,10 @@ 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 --depth 1 $DRIVERS_TOOLS
-          fi
+          git submodule update --init
           echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
 
   "upload test results":
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 90a0abd89..36640a724 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -66,13 +66,14 @@ 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 }}
 
-      - name: "Setup"
+      - name: "Setup PHP"
         uses: "./.github/actions/setup"
         with:
           php-version: ${{ matrix.php-version }}
diff --git a/.gitmodules b/.gitmodules
index be377c19d..9aaaaeb89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "drivers-evergreen-tools"]
+	path = tests/drivers-evergreen-tools
+	url = https://github.com/mongodb-labs/drivers-evergreen-tools
 [submodule "specifications"]
 	path = tests/specifications
 	url = https://github.com/mongodb/specifications
diff --git a/tests/drivers-evergreen-tools b/tests/drivers-evergreen-tools
new file mode 160000
index 000000000..8510323a1
--- /dev/null
+++ b/tests/drivers-evergreen-tools
@@ -0,0 +1 @@
+Subproject commit 8510323a1900ed9e32ad1a5c9f4f70dcd457b20d

From cca7d2bb886045b2e99a33bf38791dd7f109d20b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:48:09 +0000
Subject: [PATCH 2/2] Bump tests/drivers-evergreen-tools from `8510323` to
 `f43767d` (#1590)

Bumps [tests/drivers-evergreen-tools](https://github.com/mongodb-labs/drivers-evergreen-tools) from `8510323` to `f43767d`.
- [Commits](https://github.com/mongodb-labs/drivers-evergreen-tools/compare/8510323a1900ed9e32ad1a5c9f4f70dcd457b20d...f43767def1c0fc18919688005678ee59266b13a5)

---
updated-dependencies:
- dependency-name: tests/drivers-evergreen-tools
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tests/drivers-evergreen-tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/drivers-evergreen-tools b/tests/drivers-evergreen-tools
index 8510323a1..f43767def 160000
--- a/tests/drivers-evergreen-tools
+++ b/tests/drivers-evergreen-tools
@@ -1 +1 @@
-Subproject commit 8510323a1900ed9e32ad1a5c9f4f70dcd457b20d
+Subproject commit f43767def1c0fc18919688005678ee59266b13a5