Skip to content

Commit 5924072

Browse files
authored
Combine ci linter jobs
1 parent b7c1c8f commit 5924072

File tree

1 file changed

+13
-41
lines changed

1 file changed

+13
-41
lines changed

.github/workflows/lint.yml

Lines changed: 13 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,60 +14,32 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
jobs:
17-
lint-pycodestyle:
18-
name: Code style check with pycodestyle
17+
lint:
18+
name: Lint
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v4
23+
2324
- name: Merge CI fixes from sagemath/sage
2425
run: |
2526
.ci/merge-fixes.sh
2627
env:
2728
GH_TOKEN: ${{ github.token }}
29+
2830
- name: Set up Python
2931
uses: actions/setup-python@v4
3032
with:
3133
python-version: 3.9
32-
- name: Install pycodestyle
33-
run: pip install tox pycodestyle
34-
- name: Lint using pycodestyle
34+
35+
- name: Install dependencies
36+
run: pip install tox pycodestyle relint
37+
38+
- name: Code style check with pycodestyle
3539
run: tox -e pycodestyle-minimal
36-
lint-relint:
37-
name: Code style check with relint
38-
runs-on: ubuntu-latest
39-
steps:
40-
- name: Checkout
41-
uses: actions/checkout@v4
42-
- name: Merge CI fixes from sagemath/sage
43-
run: |
44-
.ci/merge-fixes.sh
45-
env:
46-
GH_TOKEN: ${{ github.token }}
47-
- name: Set up Python
48-
uses: actions/setup-python@v4
49-
with:
50-
python-version: 3.9
51-
- name: Install relint
52-
run: pip install tox relint
53-
- name: Lint using relint
40+
41+
- name: Code style check with relint
5442
run: tox -e relint -- src/sage/
55-
lint-rst:
56-
name: Validate docstring markup as RST
57-
runs-on: ubuntu-latest
58-
steps:
59-
- name: Checkout
60-
uses: actions/checkout@v4
61-
- name: Merge CI fixes from sagemath/sage
62-
run: |
63-
.ci/merge-fixes.sh
64-
env:
65-
GH_TOKEN: ${{ github.token }}
66-
- name: Set up Python
67-
uses: actions/setup-python@v4
68-
with:
69-
python-version: 3.9
70-
- name: Install tox
71-
run: pip install tox
72-
- name: Lint using tox -e rst
43+
44+
- name: Validate docstring markup as RST
7345
run: tox -e rst

0 commit comments

Comments
 (0)