Skip to content

Commit 4011c2b

Browse files
committed
Merge branch 'master' into add_new_on_push_poetry_workflows
2 parents cee4ff9 + 557cbaf commit 4011c2b

File tree

6 files changed

+320
-376
lines changed

6 files changed

+320
-376
lines changed

.github/workflows/on-pull-request.yaml

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,21 @@ on:
1111
- '*.*'
1212

1313
jobs:
14-
check-dependencies:
15-
# Filter out Draft Pull Requests
16-
if: github.event.pull_request.draft == false
17-
runs-on: ubuntu-latest
18-
steps:
19-
- uses: actions/checkout@v4
20-
- name: Ensure no development packages have been set
21-
run: |
22-
source <(curl -sL http://ci.q-ctrl.com)
23-
./ci docker run qctrl/ci-images:python-3.11-ci /scripts/check-for-internal-versions.sh
24-
linting:
25-
# Filter out PRs originating from this repository (triggers on-push.yml instead)
26-
if: github.event.pull_request.head.repo.fork == true
27-
runs-on: ubuntu-latest
28-
steps:
29-
- uses: actions/checkout@v4
30-
- name: Install Python dependencies
31-
run: |
32-
source <(curl -sL http://ci.q-ctrl.com)
33-
./ci docker run qctrl/ci-images:python-3.11-ci /scripts/install-python-dependencies.sh
34-
- name: Run Pre-Commit
35-
run: |
36-
./ci docker run qctrl/ci-images:python-3.11-ci poetry run pre-commit run -- -a
14+
pre-checks:
15+
uses: qctrl/reusable-workflows/.github/workflows/poetry-pre-checks.yaml@master
16+
secrets: inherit
17+
with:
18+
check-internal-versions: true
19+
housekeeping: false
20+
3721
pytest:
3822
# Filter out PRs originating from this repository (triggers on-push.yml instead)
3923
if: github.event.pull_request.head.repo.fork == true
40-
runs-on: ubuntu-latest
41-
strategy:
42-
matrix:
43-
python: ["3.9", "3.10", "3.11"]
44-
steps:
45-
- uses: actions/checkout@v4
46-
- name: Install Python dependencies
47-
run: |
48-
source <(curl -sL http://ci.q-ctrl.com)
49-
./ci docker run qctrl/ci-images:python-${{ matrix.python }}-ci /scripts/install-python-dependencies.sh
50-
- name: Run Pytest
51-
run: |
52-
./ci docker run qctrl/ci-images:python-${{ matrix.python }}-ci /scripts/pytest.sh
24+
uses: qctrl/reusable-workflows/.github/workflows/pytest.yaml@master
25+
secrets: inherit
26+
with:
27+
python-versions: '["3.10", "3.11", "3.12", "3.13"]'
28+
5329
sphinx_documentation:
5430
# Filter out PRs originating from this repository (triggers on-push.yml instead)
5531
if: github.event.pull_request.head.repo.fork == true

0 commit comments

Comments
 (0)