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

Merge v1.x into v2.x #1591

Merged
merged 2 commits into from
Feb 10, 2025
Merged
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
13 changes: 4 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"
# Make an evergreen exapanstion file with dynamic values
# Make an evergreen expansion file with dynamic values
- command: shell.exec
params:
working_dir: "src"
Expand All @@ -16,7 +16,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 @@ -111,15 +111,10 @@ 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 --depth 1 $DRIVERS_TOOLS
fi
git submodule update --init
echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config

"upload test results":
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,14 @@ 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 }}

- name: "Setup"
- name: "Setup PHP"
uses: "./.github/actions/setup"
with:
php-version: ${{ matrix.php-version }}
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "drivers-evergreen-tools"]
path = tests/drivers-evergreen-tools
url = https://github.com/mongodb-labs/drivers-evergreen-tools
[submodule "specifications"]
path = tests/specifications
url = https://github.com/mongodb/specifications
1 change: 1 addition & 0 deletions tests/drivers-evergreen-tools