diff --git a/.evergreen/README.md b/.evergreen/README.md index d5439e6a3..bae5616ef 100644 --- a/.evergreen/README.md +++ b/.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. diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml index a59363aa2..54fcb2701 100644 --- a/.evergreen/config/functions.yml +++ b/.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 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5ace4600a..3547ac743 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,7 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "gitsubmodule" + directory: "/tests/drivers-evergreen-tools" + schedule: + interval: "weekly" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8fb2368e4..7bba58447 100644 --- a/.github/workflows/tests.yml +++ b/.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 }} diff --git a/.github/workflows/windows-tests.yml b/.github/workflows/windows-tests.yml index b1e6dd544..337c92042 100644 --- a/.github/workflows/windows-tests.yml +++ b/.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" diff --git a/.gitmodules b/.gitmodules index 82028d60e..9cf4ed272 100644 --- a/.gitmodules +++ b/.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 diff --git a/tests/drivers-evergreen-tools b/tests/drivers-evergreen-tools new file mode 160000 index 000000000..f53da283a --- /dev/null +++ b/tests/drivers-evergreen-tools @@ -0,0 +1 @@ +Subproject commit f53da283a45de61a6b2d278a31454c57ceab9104