Skip to content

Commit e25fafa

Browse files
authored
PHPLIB-1613 Load drivers-evergreen-tools using submodule (#1584)
1 parent 603d160 commit e25fafa

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.evergreen/config/functions.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ functions:
44
- command: git.get_project
55
params:
66
directory: "src"
7-
# Make an evergreen exapanstion file with dynamic values
7+
# Make an evergreen expansion file with dynamic values
88
- command: shell.exec
99
params:
1010
working_dir: "src"
@@ -16,7 +16,7 @@ functions:
1616
CURRENT_VERSION=latest
1717
fi
1818
19-
export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
19+
export DRIVERS_TOOLS="$(pwd)/tests/drivers-evergreen-tools"
2020
export PROJECT_DIRECTORY="$(pwd)"
2121
2222
# Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
@@ -111,15 +111,10 @@ functions:
111111
"prepare resources":
112112
- command: shell.exec
113113
params:
114+
working_dir: src
114115
script: |
115116
${PREPARE_SHELL}
116-
rm -rf $DRIVERS_TOOLS
117-
if [ "${project}" = "drivers-tools" ]; then
118-
# If this was a patch build, doing a fresh clone would not actually test the patch
119-
cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS
120-
else
121-
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git --depth 1 $DRIVERS_TOOLS
122-
fi
117+
git submodule update --init
123118
echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
124119
125120
"upload test results":

.github/workflows/tests.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,14 @@ jobs:
6666
with:
6767
python-version: '3.13'
6868

69-
- id: setup-mongodb
70-
uses: mongodb-labs/drivers-evergreen-tools@master
69+
- name: "Setup MongoDB"
70+
id: setup-mongodb
71+
uses: ./tests/drivers-evergreen-tools
7172
with:
7273
version: ${{ matrix.mongodb-version }}
7374
topology: ${{ matrix.topology }}
7475

75-
- name: "Setup"
76+
- name: "Setup PHP"
7677
uses: "./.github/actions/setup"
7778
with:
7879
php-version: ${{ matrix.php-version }}

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[submodule "drivers-evergreen-tools"]
2+
path = tests/drivers-evergreen-tools
3+
url = https://github.com/mongodb-labs/drivers-evergreen-tools
14
[submodule "specifications"]
25
path = tests/specifications
36
url = https://github.com/mongodb/specifications

tests/drivers-evergreen-tools

Submodule drivers-evergreen-tools added at 8510323

0 commit comments

Comments
 (0)