Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHPC-2510 Install evergreen tools using git submodule #1797

Open
wants to merge 4 commits into
base: v1.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .evergreen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
12 changes: 3 additions & 9 deletions .evergreen/config/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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


Expand Down
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "gitsubmodule"
directory: "/tests/drivers-evergreen-tools"
schedule:
interval: "weekly"
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/windows-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions tests/drivers-evergreen-tools
Loading