Skip to content

Commit b1db641

Browse files
committedMar 18, 2025
PHPC-2510 Install evergreen tools using git submodule
Update drivers-evergreen-tools
1 parent e0440f0 commit b1db641

File tree

7 files changed

+19
-14
lines changed

7 files changed

+19
-14
lines changed
 

‎.evergreen/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ hosts.
1212

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

‎.evergreen/config/functions.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ functions:
2222
CURRENT_VERSION=latest
2323
fi
2424
25-
export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
25+
export DRIVERS_TOOLS="$(pwd)/tests/drivers-evergreen-tools"
2626
export PROJECT_DIRECTORY="$(pwd)"
2727
2828
# Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
@@ -72,15 +72,10 @@ functions:
7272
"prepare resources":
7373
- command: shell.exec
7474
params:
75+
working_dir: src
7576
script: |
7677
${PREPARE_SHELL}
77-
rm -rf $DRIVERS_TOOLS
78-
if [ "${project}" = "drivers-tools" ]; then
79-
# If this was a patch build, doing a fresh clone would not actually test the patch
80-
cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS
81-
else
82-
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
83-
fi
78+
git submodule update --init
8479
echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
8580
8681

‎.github/dependabot.yml

+4
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7+
- package-ecosystem: "gitsubmodule"
8+
directory: "/tests/"
9+
schedule:
10+
interval: "weekly"

‎.github/workflows/tests.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
with:
5858
python-version: '3.13'
5959

60-
- id: setup-mongodb
61-
uses: mongodb-labs/drivers-evergreen-tools@master
60+
- name: Setup MongoDB
61+
id: setup-mongodb
62+
uses: ./tests/drivers-evergreen-tools
6263
with:
6364
version: ${{ matrix.mongodb-version }}
6465
topology: ${{ matrix.topology }}

‎.github/workflows/windows-tests.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ jobs:
6464
with:
6565
submodules: true
6666

67-
- id: setup-mongodb
68-
uses: mongodb-labs/drivers-evergreen-tools@master
67+
- name: Setup MongoDB
68+
id: setup-mongodb
69+
uses: ./tests/drivers-evergreen-tools
6970
with:
7071
version: "7.0"
7172
topology: "server"

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66
path = src/libmongocrypt
77
url = https://github.com/mongodb/libmongocrypt.git
88
ignore = untracked
9+
[submodule "tests/drivers-evergreen-tools"]
10+
path = tests/drivers-evergreen-tools
11+
url = https://github.com/mongodb-labs/drivers-evergreen-tools.git

‎tests/drivers-evergreen-tools

Submodule drivers-evergreen-tools added at 4a84579

0 commit comments

Comments
 (0)