Commit 90f8708f authored by Sam Saccone's avatar Sam Saccone

tests: Remove global gulp dep

parent 08ceb647
...@@ -11,12 +11,16 @@ ...@@ -11,12 +11,16 @@
"index.html", "index.html",
"learn.json" "learn.json"
], ],
"scripts": {
"test-server": "gulp test-server &",
"gulp": "gulp"
},
"dependencies": { "dependencies": {
"express": "^4.10.0" "express": "^4.10.0"
}, },
"devDependencies": { "devDependencies": {
"del": "^0.1.1", "del": "^0.1.1",
"gulp": "^3.8.5", "gulp": "^3.9.0",
"gulp-autoprefixer": "^1.0.1", "gulp-autoprefixer": "^1.0.1",
"gulp-cache": "^0.2.0", "gulp-cache": "^0.2.0",
"gulp-csso": "^0.2.9", "gulp-csso": "^0.2.9",
......
...@@ -9,10 +9,9 @@ get_changes () ...@@ -9,10 +9,9 @@ get_changes ()
git diff HEAD origin/master --name-only | awk 'BEGIN {FS = "/"}; {print $1 "/" $2 "/" $3}' | grep -v \/\/ | grep examples | awk -F '[/]' '{print "--framework=" $2}'|uniq git diff HEAD origin/master --name-only | awk 'BEGIN {FS = "/"}; {print $1 "/" $2 "/" $3}' | grep -v \/\/ | grep examples | awk -F '[/]' '{print "--framework=" $2}'|uniq
} }
npm i -g gulp
if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ] if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]
then then
gulp npm run gulp
git submodule add -b gh-pages https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} site > /dev/null 2>&1 git submodule add -b gh-pages https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} site > /dev/null 2>&1
cd site cd site
if git checkout gh-pages; then git checkout -b gh-pages; fi if git checkout gh-pages; then git checkout -b gh-pages; fi
...@@ -32,10 +31,10 @@ else ...@@ -32,10 +31,10 @@ else
then then
exit 0 exit 0
else else
npm run test-server && \
cd tooling && \ cd tooling && \
echo $changes | xargs ./run.sh && \ echo $changes | xargs ./run.sh && \
cd ../tests && \ cd ../tests && \
(gulp test-server &) && \
sleep 2 && \ sleep 2 && \
echo $changes | xargs ./run.sh echo $changes | xargs ./run.sh
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment