Add ci task to fail on code-style (yapf)
This commit is contained in:
parent
7b164fa5ae
commit
9536cc4377
2 changed files with 7 additions and 4 deletions
5
Makefile
5
Makefile
|
@ -5,7 +5,8 @@ REPO := quay.io/quay/quay
|
|||
TAG := $(REPO):$(SHA)
|
||||
|
||||
MODIFIED_FILES_COUNT = $(shell git diff --name-only origin/master | grep -E .+\.py$ | wc -l)
|
||||
MODIFIED_FILES = $(shell git diff --name-only origin/master | grep -E .+\.py$ | paste -sd ' ')
|
||||
GIT_MERGE_BASED = $(shell git merge-base origin/master HEAD)
|
||||
MODIFIED_FILES = $(shell git diff --name-only $(GIT_MERGE_BASED) | grep -E .+\.py$ | paste -sd ' ')
|
||||
|
||||
show-modified:
|
||||
echo $(MODIFIED_FILES)
|
||||
|
@ -101,7 +102,7 @@ clean:
|
|||
|
||||
|
||||
yapf-all:
|
||||
yapf -r . -p -i -e './data/model/*.py' -e './data/oci_model/*.py' -e './data/migrations/versions/*.py'
|
||||
yapf -r . -p -i
|
||||
|
||||
|
||||
yapf-diff:
|
||||
|
|
|
@ -3,11 +3,13 @@ platform: linux
|
|||
inputs:
|
||||
- name: quay-pull-request
|
||||
run:
|
||||
path: /bin/sh
|
||||
path: /bin/bash
|
||||
args:
|
||||
- -c
|
||||
- |
|
||||
set -eux
|
||||
pip install --quiet -r quay-pull-request/requirements-dev.txt
|
||||
cd quay-pull-request
|
||||
yapf -d -r .
|
||||
export GIT_MERGE_BASED=`git merge-base origin/master HEAD`
|
||||
export MODIFIED_FILES=`git diff --name-only $(GIT_MERGE_BASED) | grep -E .+\.py$ | paste -sd ' '`
|
||||
if [ `yapf -d -p $(MODIFIED_FILES) | wc -l` -gt 0 ] ; then false ; else true ;fi
|
||||
|
|
Reference in a new issue