vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add ci task to fail on code-style (yapf)

Browse source
This commit is contained in:
Antoine Legrand 2017-04-11 10:30:25 +02:00
parent 7b164fa5ae
commit 9536cc4377
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -5,7 +5,8 @@ REPO := quay.io/quay/quay
TAG := $(REPO):$(SHA) TAG := $(REPO):$(SHA)
MODIFIED_FILES_COUNT = $(shell git diff --name-only origin/master | grep -E .+\.py$ | wc -l) 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: show-modified:
echo $(MODIFIED_FILES) echo $(MODIFIED_FILES)
@ -101,7 +102,7 @@ clean:
yapf-all: 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: yapf-diff:

6
ci/tasks/style.yaml
View file

@ -3,11 +3,13 @@ platform: linux
inputs: inputs:
- name: quay-pull-request - name: quay-pull-request
run: run:
path: /bin/sh path: /bin/bash
args: args:
- -c - -c
- | - |
set -eux set -eux
pip install --quiet -r quay-pull-request/requirements-dev.txt pip install --quiet -r quay-pull-request/requirements-dev.txt
cd quay-pull-request 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