travis redesign

.travis.yml

@@ -1,42 +1,44 @@
+env:
+  global:
+    - RCT_NO_LAUNCH_PACKAGER=true
+
 matrix:
   include:
-    - os: osx
+    - env:
+      - TYPE=iOS
+      os: osx
       osx_image: xcode9
       language: objective-c
-
-env:
-  global:
-    - RCT_NO_LAUNCH_PACKAGER=true
+      install:
+        - source ./scripts/env/env.ios.sh
+      script:
+        - ./scripts/travis.ios.sh
+    - env:
+      - TYPE=Android
+      os: linux
+      jdk: oraclejdk8
+      language: java
+      install:
+        - source ./scripts/env/env.android.sh
+      script:
+        - ./scripts/travis.android.sh
+      before_cache:
+        - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+        - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+      cache:
+        directories:
+          - $HOME/.m2
+          - $HOME/.gradle/caches/
+          - $HOME/.gradle/wrapper/
+          - $HOME/.android/build-cache
 
 branches:
   only:
   - master
   - v2
 
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - $HOME/.m2
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $HOME/.android/build-cache
-
-install:
-        # node:
-  - source ./scripts/env/installNode.sh
-        # android sdk:
-  - source ./scripts/env/installAndroidSDK.sh
-        # AppleSimUtils
-  - source ./scripts/env/installAppleSimUtils.sh
-        # xcpretty
-  - source ./scripts/env/installXcpretty.sh
-
-script:
-  - set -e
-  - ./scripts/travis.sh
-  - set +e
+before_install:
+  - nvm install 8
 
 after_script:
   - echo "BUILD FINISHED"

scripts/clean.js

@@ -6,9 +6,12 @@ function run() {
   exec.killPort(8081);
   exec.execSync(`watchman watch-del-all || true`);
   exec.execSync(`adb reverse tcp:8081 tcp:8081 || true`);
-  exec.execSync(`rm -rf lib/ios/DerivedData/`);
-  exec.execSync(`rm -rf playground/ios/DerivedData/`);
-  exec.execSync(`cd lib/android && ./gradlew clean`);
-  exec.execSync(`cd playground/android && ./gradlew clean`);
-  exec.execSync(`cd AndroidE2E && ./gradlew clean`);
+  exec.execSync(`rm -rf lib/ios/DerivedData`);
+  exec.execSync(`rm -rf playground/ios/DerivedData`);
+  exec.execSync(`rm -rf lib/android/build`);
+  exec.execSync(`rm -rf lib/android/app/build`);
+  exec.execSync(`rm -rf playground/android/build`);
+  exec.execSync(`rm -rf playground/android/app/build`);
+  exec.execSync(`rm -rf AndroidE2E/android/build`);
+  exec.execSync(`rm -rf AndroidE2E/android/app/build`);
 }

scripts/env/installAppleSimUtils.sh → scripts/env/env.ios.sh

@@ -2,3 +2,5 @@
 
 brew tap wix/brew
 brew install wix/brew/applesimutils
+
+gem install xcpretty

scripts/env/installNode.sh

@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-nvm install 8

scripts/env/installXcpretty.sh

@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-gem install xcpretty

scripts/travis-fold.sh

@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+lightCyan='\033[1;36m'
+green='\033[0;32m'
+nocolor='\033[0m'
+
+cmd="${1}"
+name=${cmd//[ ]/_}
+
+echo "travis_fold:start:$name"
+echo -e "${lightCyan}\t\t $cmd ${nocolor}"
+SECONDS=0
+
+($cmd)
+
+duration=$SECONDS
+echo "travis_fold:end:$name"
+echo -e "${green}\t\t\t --> $(($duration / 60)) minutes and $(($duration % 60)) seconds ${nocolor}\n"

scripts/travis.android.sh

@@ -0,0 +1,5 @@
+./scripts/travis-fold.sh "npm install"
+./scripts/travis-fold.sh "npm run clean"
+./scripts/travis-fold.sh "npm run test-js"
+./scripts/travis-fold.sh "npm run test-unit-android -- --release"
+./scripts/travis-fold.sh "npm run test-e2e-android -- --release"

scripts/travis.ios.sh

@@ -0,0 +1,5 @@
+./scripts/travis-fold.sh "npm install"
+./scripts/travis-fold.sh "npm run clean"
+./scripts/travis-fold.sh "npm run test-js"
+./scripts/travis-fold.sh "npm run test-unit-ios -- --release"
+./scripts/travis-fold.sh "npm run test-e2e-ios -- --release"

scripts/travis.js.sh

@@ -0,0 +1,8 @@
+./scripts/travis-fold.sh "npm install"
+./scripts/travis-fold.sh "npm run clean"
+./scripts/travis-fold.sh "npm run test-js"
+./scripts/travis-fold.sh "npm run test-unit-android -- --release"
+./scripts/travis-fold.sh "npm run test-unit-ios -- --release"
+./scripts/travis-fold.sh "npm run test-e2e-android -- --release"
+./scripts/travis-fold.sh "npm run test-e2e-ios -- --release"
+# ./scripts/travis-fold.sh "npm run release"

scripts/travis.sh

@@ -1,29 +0,0 @@
-#!/bin/bash -e
-
-lightCyan='\033[1;36m'
-green='\033[0;32m'
-nocolor='\033[0m'
-
-run_f () {
-  cmd="${1}"
-  name=${cmd//[ ]/_}
-
-  echo "travis_fold:start:$name"
-  echo -e "${lightCyan}\t\t $cmd ${nocolor}"
-  SECONDS=0
-
-  ($cmd)
-
-  duration=$SECONDS
-  echo "travis_fold:end:$name"
-  echo -e "${green}\t\t\t --> $(($duration / 60)) minutes and $(($duration % 60)) seconds ${nocolor}\n"
-}
-
-run_f "npm install"
-run_f "npm run clean"
-run_f "npm run test-js"
-run_f "npm run test-unit-android -- --release"
-run_f "npm run test-unit-ios -- --release"
-run_f "npm run test-e2e-android -- --release"
-run_f "npm run test-e2e-ios -- --release"
-run_f "npm run release"