@@ -62,10 +62,10 @@ concurrency:
6262permissions : read-all
6363
6464jobs :
65- python-format :
66- name : Python format checks
65+ python-checks :
66+ name : ' Python format & lint checks'
6767 runs-on : ubuntu-slim
68- timeout-minutes : 15
68+ timeout-minutes : 20
6969 steps :
7070 - name : Check out a copy of the git repository
7171 uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -91,48 +91,14 @@ jobs:
9191
9292 - name : Install dependencies
9393 if : steps.changes.outputs.any_changed == 'true'
94- run : |
95- pip install -r requirements.txt
96- pip install -r dev-requirements.txt
94+ run : pip install -r requirements.txt -r dev-requirements.txt
9795
9896 - name : Check the format of changed Python files
9997 if : steps.changes.outputs.any_changed == 'true'
10098 run : |
10199 echo '::add-matcher::.github/problem-matchers/flynt.json'
102100 echo '::add-matcher::.github/problem-matchers/black.json'
103- check/format-incremental
104-
105- python-lint :
106- name : Python lint checks
107- needs : [python-format]
108- runs-on : ubuntu-slim
109- timeout-minutes : 15
110- steps :
111- - name : Check out a copy of the git repository
112- uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
113- with :
114- fetch-depth : 0
115-
116- - name : Get a list of changed Python files
117- id : changes
118- uses : tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47
119- with :
120- base_sha : ${{inputs.base_sha}}
121- files : ' **/*.py'
122-
123- - name : Set up Python
124- if : steps.changes.outputs.any_changed == 'true'
125- uses : actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v5
126- with :
127- python-version : ${{env.python-version}}
128- cache : pip
129- cache-dependency-path : |
130- requirements.txt
131- dev-requirements.txt
132-
133- - name : Install dependencies
134- if : steps.changes.outputs.any_changed == 'true'
135- run : pip install pylint~=3.3.1
101+ check/format-incremental ${{inputs.base_sha}}
136102
137103 - name : Lint the changed Python files
138104 if : steps.changes.outputs.any_changed == 'true'
@@ -298,8 +264,7 @@ jobs:
298264 needs :
299265 - action-lint
300266 - bazel-lint
301- - python-format
302- - python-lint
267+ - python-checks
303268 - shell-lint
304269 - yaml-lint
305270 runs-on : ${{matrix.os}}
@@ -395,8 +360,7 @@ jobs:
395360 needs :
396361 - action-lint
397362 - bazel-lint
398- - python-format
399- - python-lint
363+ - python-checks
400364 - shell-lint
401365 - yaml-lint
402366 runs-on : ubuntu-24.04
@@ -451,8 +415,7 @@ jobs:
451415 needs :
452416 - action-lint
453417 - bazel-lint
454- - python-format
455- - python-lint
418+ - python-checks
456419 - shell-lint
457420 - yaml-lint
458421 runs-on : ubuntu-24.04
@@ -507,8 +470,7 @@ jobs:
507470 needs :
508471 - action-lint
509472 - docker-lint
510- - python-format
511- - python-lint
473+ - python-checks
512474 - shell-lint
513475 - yaml-lint
514476 runs-on : ubuntu-24.04
@@ -556,8 +518,7 @@ jobs:
556518 - library-tests
557519 - memory-tests
558520 - options-tests
559- - python-format
560- - python-lint
521+ - python-checks
561522 - shell-lint
562523 - yaml-lint
563524 runs-on : ubuntu-slim
@@ -573,8 +534,7 @@ jobs:
573534 || (needs.library-tests.result != 'success' && needs.library-tests.result != 'skipped')
574535 || (needs.memory-tests.result != 'success' && needs.memory-tests.result != 'skipped')
575536 || (needs.options-tests.result != 'success' && needs.options-tests.result != 'skipped')
576- || (needs.python-format.result != 'success' && needs.python-format.result != 'skipped')
577- || (needs.python-lint.result != 'success' && needs.python-lint.result != 'skipped')
537+ || (needs.python-checks.result != 'success' && needs.python-checks.result != 'skipped')
578538 || (needs.shell-lint.result != 'success' && needs.shell-lint.result != 'skipped')
579539 || (needs.yaml-lint.result != 'success' && needs.yaml-lint.result != 'skipped')
580540 }}
0 commit comments