Skip to content

Commit 3a51735

Browse files
PYTHON-5349 Use drivers-evergreen-tools to start servers in GitHub Actions (#2474)
(cherry picked from commit b83fcbb)
1 parent e80f4f4 commit 3a51735

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

.github/workflows/test-python.yml

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,33 +50,31 @@ jobs:
5050
cppcheck pymongo
5151
5252
build:
53-
# supercharge/mongodb-github-action requires containers so we don't test other platforms
5453
runs-on: ${{ matrix.os }}
5554
strategy:
5655
fail-fast: false
5756
matrix:
57+
# Tests currently only pass on ubuntu on GitHub Actions.
5858
os: [ubuntu-latest]
59-
python-version: ["3.9", "pypy-3.10", "3.13", "3.13t"]
59+
python-version: ["3.9", "pypy-3.10", "3.13t"]
60+
mongodb-version: ["8.0"]
61+
6062
name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
6163
steps:
6264
- uses: actions/checkout@v4
6365
with:
6466
persist-credentials: false
65-
- name: Install just
66-
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
6767
- name: Install uv
6868
uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
6969
with:
7070
enable-cache: true
7171
python-version: ${{ matrix.python-version }}
72-
- name: Install dependencies
73-
run: just install
74-
- name: Start MongoDB
75-
uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # 1.12.0
72+
- id: setup-mongodb
73+
uses: mongodb-labs/drivers-evergreen-tools@master
7674
with:
77-
mongodb-version: 6.0
75+
version: "${{ matrix.mongodb-version }}"
7876
- name: Run tests
79-
run: just test
77+
run: uv run --extra test pytest -v
8078

8179
doctest:
8280
runs-on: ubuntu-latest
@@ -92,10 +90,10 @@ jobs:
9290
with:
9391
enable-cache: true
9492
python-version: "3.9"
95-
- name: Start MongoDB
96-
uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # 1.12.0
93+
- id: setup-mongodb
94+
uses: mongodb-labs/drivers-evergreen-tools@master
9795
with:
98-
mongodb-version: '8.0.0-rc4'
96+
version: "8.0"
9997
- name: Install dependencies
10098
run: just install
10199
- name: Run tests
@@ -210,8 +208,8 @@ jobs:
210208
cache-dependency-path: 'sdist/test/pyproject.toml'
211209
# Test sdist on lowest supported Python
212210
python-version: '3.9'
213-
- name: Start MongoDB
214-
uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # 1.12.0
211+
- id: setup-mongodb
212+
uses: mongodb-labs/drivers-evergreen-tools@master
215213
- name: Run connect test from sdist
216214
shell: bash
217215
run: |
@@ -234,10 +232,10 @@ jobs:
234232
uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
235233
with:
236234
python-version: '3.9'
237-
- name: Start MongoDB
238-
uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # 1.12.0
235+
- id: setup-mongodb
236+
uses: mongodb-labs/drivers-evergreen-tools@master
239237
with:
240-
mongodb-version: 6.0
238+
version: "8.0"
241239
# Async and our test_dns do not support dnspython 1.X, so we don't run async or dns tests here
242240
- name: Run tests
243241
shell: bash
@@ -260,10 +258,10 @@ jobs:
260258
uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v5
261259
with:
262260
python-version: '3.9'
263-
- name: Start MongoDB
264-
uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # 1.12.0
261+
- id: setup-mongodb
262+
uses: mongodb-labs/drivers-evergreen-tools@master
265263
with:
266-
mongodb-version: 6.0
264+
version: "8.0"
267265
# The lifetime kwarg we use in srv resolution was added to the async resolver API in dnspython 2.1.0
268266
- name: Run tests
269267
shell: bash

.github/zizmor.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
rules:
2+
unpinned-uses:
3+
config:
4+
policies:
5+
actions/*: ref-pin
6+
mongodb-labs/drivers-github-tools/*: ref-pin
7+
mongodb-labs/drivers-evergreen-tools: ref-pin

0 commit comments

Comments
 (0)