Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 704f914

Browse files
GromNaNjmikolaalcaeus
authored
PHPC-2510 Install evergreen tools using git submodule (#1797)
* PHPC-2510 Install evergreen tools using git submodule Update drivers-evergreen-tools * Update .evergreen/README.md Co-authored-by: Jeremy Mikola <jmikola@gmail.com> * Track submodule precisely * Full history must be fetched * Update submodule * Fix paths for drivers-evergreen-tools when fetching build --------- Co-authored-by: Jeremy Mikola <jmikola@gmail.com> Co-authored-by: Andreas Braun <andreas.braun@mongodb.com>
1 parent 0629d11 commit 704f914

File tree

7 files changed

+22
-15
lines changed

7 files changed

+22
-15
lines changed

‎.evergreen/README.md‎

Lines changed: 2 additions & 2 deletions
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` directory.

‎.evergreen/config/functions.yml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ functions:
44
- command: git.get_project
55
params:
66
directory: "src"
7-
# Fetch the libmongoc submodule
7+
# Fetch the submodules
88
- command: shell.exec
99
params:
1010
working_dir: "src"
@@ -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,9 @@ 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
8478
echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
8579
8680
@@ -132,6 +126,9 @@ functions:
132126
script: |
133127
${PREPARE_SHELL}
134128
perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" Makefile
129+
for filename in $(find ${DRIVERS_TOOLS} -name \*.json); do
130+
perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" $filename
131+
done
135132
136133
"compile driver" :
137134
- command: shell.exec

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
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/drivers-evergreen-tools"
9+
schedule:
10+
interval: "weekly"

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 2 deletions
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‎

Lines changed: 3 additions & 2 deletions
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‎

Lines changed: 3 additions & 0 deletions
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 f53da28

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /