Update travis (#4054)

.travis.yml

@@ -1,12 +1,15 @@
 language: python
-node_js: "8.4.0"
+node_js: "8"
 
 cache:
-  directories:
-    - node_modules
+  - pip
+  - yarn
 
 env:
-  - DISPLAY=':99.0'
+  global:
+    - DISPLAY=':99.0'
+    - YARN_VERSION='0.24.5'
+    - MC_COMMIT='abd295766dfe'
 
 addons:
   apt:
@@ -18,13 +21,17 @@ addons:
 install:
   - pip install --upgrade pip
   - pip install -U mercurial
+  - . $HOME/.nvm/nvm.sh; nvm install stable; nvm use stable
+  - ./bin/ci/install-yarn
   - ./bin/ci/clone-gecko.sh
-  - npm install
+  - du -sh firefox
+  - yarn
 
 before_script:
   - ./bin/ci/build-firefox.sh
   - sh -e /etc/init.d/xvfb start
 
 script:
-  - echo $TRAVIS_COMMIT_RANGE
+  - node --version
+  - du -sh firefox
   - ./bin/ci/run-tests.sh $TRAVIS_COMMIT_RANGE

bin/ci/build-firefox.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd gecko
+cd firefox
 # We have to set that env variable otherwise
 # ./mach build is going to be interactive and expect <ENTER>
 # to be pressed to continue. Here travis would just be stuck...

bin/ci/clone-gecko.sh

@@ -1,12 +1,9 @@
 #!/bin/bash
 
 hg --version
-if [ ! -d "gecko/.hg" ]; then
-  rm -rf gecko/
-  hg clone https://hg.mozilla.org/mozilla-unified/ gecko
-else
-  cd gecko
-  hg strip --no-backup 'roots(outgoing())'
-  hg pull -u
-  cd ..
-fi
+rm -rf firefox/
+hg clone https://hg.mozilla.org/mozilla-unified/ firefox
+
+cd firefox
+hg co $MC_COMMIT
+cd ..

bin/ci/run-tests.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-node ./bin/copy-assets.js --mc gecko
-
-cd gecko
-
-./mach mochitest devtools/client/debugger/new
-
-cd ..
+node ./bin/copy-assets.js --mc firefox
+node bin/mochi.js
+exit $?

circle.yml

@@ -28,24 +28,21 @@ test:
     - yarn lint-js
     - yarn lint-md
     - yarn flow
-    - ./bin/run-mochitests-docker
   post:
     - yarn flow-coverage -- -t json -o $CIRCLE_TEST_REPORTS/flow-coverage
     - yarn check --integrity
     - bash <(curl -s https://codecov.io/bash) -f $CIRCLE_TEST_REPORTS/jest-coverage/coverage-final.json
 
 dependencies:
   pre:
-    - ./bin/install-yarn
+    - ./bin/ci/install-yarn
     - yarn global add greenkeeper-lockfile@1
   cache_directories:
-    - ~/downloads
     - ~/.cache/yarn
     - ~/.yarn
   override:
     - yarn install
     - yarn global add flow-coverage-report
-    - ./bin/update-docker
 
 general:
   artifacts: