diff options
| author |  Sandro Jäckel <sandro.jaeckel@gmail.com>
| 2019-07-22 21:47:17 +0200 |
|---|---|---|
| committer |  Frans de Jonge <fransdejonge@gmail.com>
| 2019-07-23 08:49:41 +0200 |
| commit | 2b50909fb5ec369e2026fe3510f4936b941092ce (patch) | |
| tree | 31731b33657ac08a25aaf1f174f56ada58dea4aa | |
| parent | f5a93e32b4e024d944f58d566f97bc35104410f8 (diff) | |
Move shellcheck to lint job
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b5682ace7..82f50f1ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ script: - phpenv rehash - find . -not -path "./lib/JSON.php" -name \*.php -print0 | xargs -0 -n1 -P4 php -l 1>/dev/null 2>php-l-results - if [ -s php-l-results ]; then cat php-l-results; exit 1; fi - - bash tests/shellchecks.sh - | if [[ $VALIDATE_STANDARD == yes ]]; then COMPOSER_BIN=$(composer global config --absolute bin-dir) @@ -50,6 +49,7 @@ matrix: - curl -sLo "$HADOLINT" $(curl -s https://api.github.com/repos/hadolint/hadolint/releases/latest?access_token="$GITHUB_TOKEN" | jq -r '.assets | .[] | select(.name=="hadolint-Linux-x86_64") | .browser_download_url') && chmod 700 ${HADOLINT} script: - node_modules/jshint/bin/jshint . + - bash tests/shellchecks.sh - git ls-files --exclude='*Dockerfile*' --ignored | xargs --max-lines=1 "$HADOLINT" allow_failures: - env: CHECK_TRANSLATION=yes VALIDATE_STANDARD=no |