Skip to content

Commit

Permalink
Merge branch 'scaffolding-cinofailpylintnoprivate' into 'scaffolding'
Browse files Browse the repository at this point in the history
[DCK] Skip pylint if no private addons found

See merge request !2
  • Loading branch information
Jairo Llopis committed Sep 15, 2017
2 parents f77e3d7 + a3aadc4 commit fafa2ec
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .gitlab-ci.yml
Expand Up @@ -18,8 +18,10 @@ Pull and build images on private addons:
Pylint for main branches on private addons:
variables:
CFG: travis_run_pylint.cfg
script:
- &pylint
script: &pylint
- PRIVATE_ADDONS="$(ls -1 odoo/custom/src/private | tr -s '\n' ,)"
- test -n "$PRIVATE_ADDONS" || echo No private addons found
- test -z "$PRIVATE_ADDONS" ||
docker-compose run --rm --user root -e LOG_LEVEL=WARNING odoo bash -c "
git clone --depth 1 $MQT_REPO $MQT_PATH &&
pip install -q --no-cache pylint-odoo &&
Expand All @@ -32,17 +34,15 @@ Pylint for main branches on private addons:
Pylint for merge requests on private addons:
variables:
CFG: travis_run_pylint_pr.cfg
script:
- *pylint
script: *pylint
except:
- *main_branches

Pylint beta on private addons:
allow_failure: true
variables:
CFG: travis_run_pylint_beta.cfg
script:
- *pylint
script: *pylint

Flake8 on private addons:
script:
Expand Down

0 comments on commit fafa2ec

Please sign in to comment.