Browse Source

fix installAndroidSDK

Daniel Zlotin 7 years ago
parent
commit
d5a24dfffb
3 changed files with 5 additions and 4 deletions
  1. 1
    1
      scripts/env/installAndroidSDK.sh
  2. 1
    1
      scripts/env/installYarn.sh
  3. 3
    2
      scripts/test.all.js

+ 1
- 1
scripts/env/installAndroidSDK.sh View File

@@ -1,4 +1,4 @@
1
-#!/bin/bash -e
1
+#!/bin/sh -e
2 2
 
3 3
 export ANDROID_HOME=$HOME/android-sdk-macosx
4 4
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools

+ 1
- 1
scripts/env/installYarn.sh View File

@@ -1,4 +1,4 @@
1 1
 #!/bin/bash -e
2 2
 
3
-export PATH=$PATH:$HOME/.yarn/bin
4 3
 curl -o- -L https://yarnpkg.com/install.sh | bash
4
+export PATH=$PATH:$HOME/.yarn/bin

+ 3
- 2
scripts/test.all.js View File

@@ -1,9 +1,10 @@
1 1
 const exec = require('shell-utils').exec;
2 2
 
3 3
 function run() {
4
+  exec.execSync(`yarn run clean`);
4 5
   exec.execSync(`yarn run test-js`);
5
-  exec.execSync(`yarn run test-unit-android && yarn run test-unit-ios -- release`);
6
-  exec.exec(`yarn run test-e2e-android`);
6
+  exec.execSync(`yarn run test-unit-android -- release && yarn run test-unit-ios -- release`);
7
+  exec.exec(`yarn run test-e2e-android -- release`);
7 8
   exec.exec(`yarn run test-e2e-ios -- release`);
8 9
 }
9 10