Fix concurrently command use (#4748)

* Fix concurrently command use

* Command missing parameter

* Remove parallel linting

* fix script

* Fix build

* Run lint concurrently
This commit is contained in:
davidcanonieto
2019-05-20 12:25:42 +01:00
committed by Denys Vuika
parent 0af9e45cff
commit 2f44c45903
3 changed files with 2 additions and 6 deletions

View File

@@ -235,4 +235,3 @@
} }
} }
} }

View File

@@ -12,9 +12,7 @@ cd "$DIR/../"
echo "====== Parallel lint =====" 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 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
echo "====== exclude-word ====="
if grep "envalfresco" . -R --exclude-dir={node_modules,.history,.idea,scripts}; then if grep "envalfresco" . -R --exclude-dir={node_modules,.history,.idea,scripts}; then
echo not permitted word echo not permitted word

View File

@@ -6,14 +6,13 @@ cd $DIR/../../../
rm -rf tmp && mkdir tmp; rm -rf tmp && mkdir tmp;
./scripts/lint.sh || exit 1;
if [[ $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $TRAVIS_PULL_REQUEST == "false" ]];
then then
./scripts/npm-build-all.sh || exit 1; ./scripts/npm-build-all.sh || exit 1;
else else
./scripts/update-version.sh -gnu -alpha || exit 1; ./scripts/update-version.sh -gnu -alpha || exit 1;
npm install; npm install;
./scripts/lint.sh || exit 1;
./scripts/smart-build.sh -b $TRAVIS_BRANCH -gnu || exit 1; ./scripts/smart-build.sh -b $TRAVIS_BRANCH -gnu || exit 1;
fi; fi;