Skip to content

Commit e8c63dc

Browse files
committed
chore: add mergify CI
1 parent 1b1375f commit e8c63dc

File tree

8 files changed

+39
-332
lines changed

8 files changed

+39
-332
lines changed

.github/pull.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: "1"
2+
rules:
3+
- base: main
4+
upstream: pytest-dev:main
5+
mergeMethod: rebase
6+

.github/workflows/deploy.yml

Lines changed: 0 additions & 116 deletions
This file was deleted.

.github/workflows/prepare-release-pr.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/workflows/stale.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/test.yml renamed to .github/workflows/test-ci-insights.yml

Lines changed: 20 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- "[0-9]+.[0-9]+.x"
8-
- "test-me-*"
9-
tags:
10-
- "[0-9]+.[0-9]+.[0-9]+"
11-
- "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
12-
137
pull_request:
14-
branches:
15-
- main
16-
- "[0-9]+.[0-9]+.x"
17-
types:
18-
- opened # default
19-
- synchronize # default
20-
- reopened # default
21-
- ready_for_review # used in PRs created from the release workflow
8+
workflow_dispatch:
9+
schedule:
10+
- cron: 0 */4 * * 1-5
2211

23-
workflow_dispatch: # allows manual triggering of the workflow
2412

2513
env:
2614
PYTEST_ADDOPTS: "--color=yes"
@@ -87,8 +75,8 @@ jobs:
8775
"macos-py313",
8876
"macos-py314",
8977

90-
"doctesting",
91-
"plugins",
78+
# "doctesting",
79+
# "plugins",
9280
]
9381

9482
include:
@@ -247,17 +235,17 @@ jobs:
247235
os: macos-latest
248236
tox_env: "py314-xdist"
249237

250-
- name: "plugins"
251-
python: "3.12"
252-
os: ubuntu-latest
253-
tox_env: "plugins"
254-
255-
256-
- name: "doctesting"
257-
python: "3.9"
258-
os: ubuntu-latest
259-
tox_env: "doctesting"
260-
use_coverage: true
238+
# - name: "plugins"
239+
# python: "3.12"
240+
# os: ubuntu-latest
241+
# tox_env: "plugins"
242+
#
243+
#
244+
# - name: "doctesting"
245+
# python: "3.9"
246+
# os: ubuntu-latest
247+
# tox_env: "doctesting"
248+
# use_coverage: true
261249

262250
continue-on-error: >-
263251
${{
@@ -303,38 +291,9 @@ jobs:
303291
python -m pip install --upgrade pip
304292
pip install tox coverage
305293
306-
- name: Test without coverage
307-
if: "! matrix.use_coverage"
294+
- name: Test
308295
shell: bash
296+
env:
297+
MERGIFY_TOKEN: ${{ secrets.MERGIFY_TOKEN }}
298+
MERGIFY_TEST_JOB_NAME: build (${{ matrix.tox_env }})
309299
run: tox run -e ${{ matrix.tox_env }} --installpkg `find dist/*.tar.gz`
310-
311-
- name: Test with coverage
312-
if: "matrix.use_coverage"
313-
shell: bash
314-
run: tox run -e ${{ matrix.tox_env }}-coverage --installpkg `find dist/*.tar.gz`
315-
316-
- name: Generate coverage report
317-
if: "matrix.use_coverage"
318-
run: python -m coverage xml
319-
320-
- name: Upload coverage to Codecov
321-
if: "matrix.use_coverage"
322-
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24
323-
with:
324-
fail_ci_if_error: false
325-
files: ./coverage.xml
326-
verbose: true
327-
328-
check: # This job does nothing and is only used for the branch protection
329-
if: always()
330-
331-
needs:
332-
- build
333-
334-
runs-on: ubuntu-latest
335-
336-
steps:
337-
- name: Decide whether the needed jobs succeeded or failed
338-
uses: re-actors/alls-green@2765efec08f0fd63e83ad900f5fd75646be69ff6
339-
with:
340-
jobs: ${{ toJSON(needs) }}

.github/workflows/update-plugin-list.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ optional-dependencies.dev = [
6363
"requests",
6464
"setuptools",
6565
"xmlschema",
66+
"pytest-mergify",
6667
]
6768
urls.Changelog = "https://docs.pytest.org/en/stable/changelog.html"
6869
urls.Contact = "https://docs.pytest.org/en/stable/contact.html"

0 commit comments

Comments
 (0)