Browse Source

update travis.yml

Daniel Zlotin 8 years ago
parent
commit
52c0f9d219
3 changed files with 2 additions and 12 deletions
  1. 1
    8
      .travis.yml
  2. 1
    0
      playground/scripts/e2e.ios.js
  3. 0
    4
      scripts/clean.sh

+ 1
- 8
.travis.yml View File

@@ -8,7 +8,6 @@ env:
8 8
     - PATH=$PATH:$HOME/.yarn/bin
9 9
     - ANDROID_HOME=$HOME/android-sdk-macosx
10 10
     - PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
11
-    - YARN_CACHE=$HOME/.yarn-cache
12 11
 
13 12
 git:
14 13
   depth: 10
@@ -20,7 +19,7 @@ branches:
20 19
 
21 20
 cache:
22 21
   directories:
23
-    - $YARN_CACHE
22
+    - $HOME/.yarn-cache
24 23
     - $HOME/.gradle/
25 24
     - $HOME/.m2
26 25
     - $ANDROID_HOME/licenses/
@@ -32,17 +31,11 @@ before_cache:
32 31
 before_install:
33 32
   - brew update
34 33
   - brew cask install java
35
-  - touch ~/.nvmrc
36
-  - rm -rf ~/.nvm
37
-  - git clone https://github.com/creationix/nvm.git ~/.nvm
38
-  - source ~/.nvm/nvm.sh
39 34
   - nvm install $NODE_VERSION
40 35
   - curl -o- -L https://yarnpkg.com/install.sh | bash
41
-  - yarn cache dir
42 36
 
43 37
 install:
44 38
   - set -e
45
-  - ./scripts/clean.sh
46 39
   - yarn install
47 40
 
48 41
 script:

+ 1
- 0
playground/scripts/e2e.ios.js View File

@@ -26,6 +26,7 @@ function buildProjForDetox() {
26 26
 
27 27
 function e2e() {
28 28
   try {
29
+    shellUtils.exec.execSyncSilent(`watchman watch-del-all || true`);
29 30
     shellUtils.exec.kill(`detox-server`);
30 31
     shellUtils.exec.exec(`./node_modules/.bin/detox-server > ./detox-server.log 2>&1`);
31 32
     const detoxAppBuildPath = `ios/DerivedData/playground/Build/Products/${release ? 'Release' : 'Debug'}_Detox-iphonesimulator/playground.app`;

+ 0
- 4
scripts/clean.sh View File

@@ -1,4 +0,0 @@
1
-#!/bin/sh -e
2
-
3
-watchman watch-del-all 2> /dev/null || true
4
-rm -rf "$TMPDIR/react-packager-*" || true