From 2f44c45903eebe63736433a82c7e314c53950878 Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Mon, 20 May 2019 12:25:42 +0100 Subject: [PATCH] Fix concurrently command use (#4748) * Fix concurrently command use * Command missing parameter * Remove parallel linting * fix script * Fix build * Run lint concurrently --- package.json | 1 - scripts/lint.sh | 4 +--- scripts/travis/build/build.sh | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 103ab9bad9..b169b64880 100644 --- a/package.json +++ b/package.json @@ -235,4 +235,3 @@ } } } - diff --git a/scripts/lint.sh b/scripts/lint.sh index 65add8ca38..6cbef049e2 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -12,9 +12,7 @@ cd "$DIR/../" echo "====== Parallel lint =====" -concurrently -s "npm run lint-lib || exit 1" "npm run stylelint || exit 1" "npm run spellcheck || exit " "ng lint dev || exit 1" "npm run lint-e2e || exit 1" || exit 1 - -echo "====== exclude-word =====" +npx concurrently -s "all" "npm run lint-lib || exit 1" "npm run stylelint || exit 1" "npm run spellcheck || exit " "ng lint dev || exit 1" "npm run lint-e2e || exit 1" || exit 1 if grep "envalfresco" . -R --exclude-dir={node_modules,.history,.idea,scripts}; then echo not permitted word diff --git a/scripts/travis/build/build.sh b/scripts/travis/build/build.sh index 0ca6558529..599b24915e 100755 --- a/scripts/travis/build/build.sh +++ b/scripts/travis/build/build.sh @@ -6,14 +6,13 @@ cd $DIR/../../../ rm -rf tmp && mkdir tmp; -./scripts/lint.sh || exit 1; - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then ./scripts/npm-build-all.sh || exit 1; else ./scripts/update-version.sh -gnu -alpha || exit 1; npm install; + ./scripts/lint.sh || exit 1; ./scripts/smart-build.sh -b $TRAVIS_BRANCH -gnu || exit 1; fi;