Skip to content

Commit

Permalink
Merge pull request #35474 from felixfbecker/use-local-gulp
Browse files Browse the repository at this point in the history
Use local gulp in CI
  • Loading branch information
joaomoreno committed Oct 3, 2017
2 parents bcb3e0d + 070c3c4 commit 38ae918
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ before_install:
- nvm install 7.9.0
- nvm use 7.9.0
- npm config set python `which python`
- npm install -g gulp
- if [ $TRAVIS_OS_NAME == "linux" ]; then
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
sh -e /etc/init.d/xvfb start;
Expand All @@ -45,10 +44,10 @@ install:
- ./scripts/npm.sh install

script:
- gulp hygiene --silent
- gulp electron --silent
- gulp compile --silent --max_old_space_size=4096
- gulp optimize-vscode --silent --max_old_space_size=4096
- node_modules/.bin/gulp hygiene --silent
- node_modules/.bin/gulp electron --silent
- node_modules/.bin/gulp compile --silent --max_old_space_size=4096
- node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi
- ./scripts/test-integration.sh

Expand Down
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ cache:
install:
- ps: Install-Product node 7.9.0 x64
- npm install -g npm@4 --silent
- npm install -g gulp mocha --silent

build_script:
- .\scripts\npm.bat install
- gulp electron
- .\node_modules\.bin\gulp electron
- npm run compile

test_script:
Expand Down

0 comments on commit 38ae918

Please sign in to comment.