Parcourir la source

Move shellcheck to lint job

Sandro Jäckel il y a 6 ans
Parent
commit
2b50909fb5
1 fichiers modifiés avec 1 ajouts et 1 suppressions
  1. 1 1
      .travis.yml

+ 1 - 1
.travis.yml

@@ -16,7 +16,6 @@ script:
   - phpenv rehash
   - phpenv rehash
   - find . -not -path "./lib/JSON.php" -name \*.php -print0 | xargs -0 -n1 -P4 php -l 1>/dev/null 2>php-l-results
   - 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
   - if [ -s php-l-results ]; then cat php-l-results; exit 1; fi
-  - bash tests/shellchecks.sh
   - |
   - |
     if [[ $VALIDATE_STANDARD == yes ]]; then
     if [[ $VALIDATE_STANDARD == yes ]]; then
       COMPOSER_BIN=$(composer global config --absolute bin-dir)
       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}
         - 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:
       script:
         - node_modules/jshint/bin/jshint .
         - node_modules/jshint/bin/jshint .
+        - bash tests/shellchecks.sh
         - git ls-files --exclude='*Dockerfile*' --ignored | xargs --max-lines=1 "$HADOLINT"
         - git ls-files --exclude='*Dockerfile*' --ignored | xargs --max-lines=1 "$HADOLINT"
   allow_failures:
   allow_failures:
     - env: CHECK_TRANSLATION=yes VALIDATE_STANDARD=no
     - env: CHECK_TRANSLATION=yes VALIDATE_STANDARD=no