Browse Source

clean up ci

Daniel Zlotin 8 years ago
parent
commit
b7e805a950
2 changed files with 11 additions and 1 deletions
  1. 5
    1
      playground/scripts/e2e.ios.js
  2. 6
    0
      scripts/travis.sh

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

@@ -40,7 +40,7 @@ function hasXcpretty() {
40 40
   }
41 41
 }
42 42
 
43
-function e2e() {
43
+function e2e() { //eslint-disable-line
44 44
   try {
45 45
     shellUtils.exec.execSync(`echo 'travis_fold:start:detox-ios'`);
46 46
     shellUtils.exec.execSyncSilent(`watchman watch-del-all || true`);
@@ -57,6 +57,10 @@ function e2e() {
57 57
   } finally {
58 58
     shellUtils.exec.execSync(`./scripts/detoxDebugFix.rb`);
59 59
     shellUtils.exec.kill(`detox-server`);
60
+    if (process.env.CI) {
61
+      shellUtils.exec.kill(`Simulator`);
62
+      shellUtils.exec.kill(`CoreSimulator`);
63
+    }
60 64
     shellUtils.exec.execSync(`cat ./detox-server.log`);
61 65
     shellUtils.exec.execSync(`rm -f ./detox-server.log`);
62 66
     shellUtils.exec.execSync(`sleep 5`);

+ 6
- 0
scripts/travis.sh View File

@@ -1,11 +1,17 @@
1 1
 #!/bin/bash -e
2 2
 
3
+color='\033[1;36m'
4
+nocolor='\033[0m'
5
+
3 6
 run_f () {
4 7
   cmd="${1}"
5 8
   name=${cmd//[ ]/_}
6 9
 
7 10
   echo "travis_fold:start:$name"
11
+  echo -e "${color}\t $cmd \t${nocolor}"
12
+
8 13
   ($cmd)
14
+
9 15
   echo "travis_fold:end:$name"
10 16
 }
11 17