fixed travis and ios release

playground/ios/playground.xcodeproj/project.pbxproj

@@ -813,7 +813,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/packager/react-native-xcode.sh";
+			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/packager/react-native-xcode.sh ./playground/index.ios.js";
 		};
 /* End PBXShellScriptBuildPhase section */
 

playground/ios/playground.xcodeproj/xcshareddata/xcschemes/playground.xcscheme

@@ -6,6 +6,20 @@
       parallelizeBuildables = "NO"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3D3C04B91DE3340900C268FA"
+               BuildableName = "libyoga.a"
+               BlueprintName = "yoga"
+               ReferencedContainer = "container:../../node_modules/react-native/React/React.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -17,7 +31,7 @@
                BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
                BuildableName = "libReact.a"
                BlueprintName = "React"
-               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
+               ReferencedContainer = "container:../../node_modules/react-native/React/React.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry

playground/ios/playground.xcodeproj/xcshareddata/xcschemes/playground_release.xcscheme

@@ -6,6 +6,20 @@
       parallelizeBuildables = "NO"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3D3C04B91DE3340900C268FA"
+               BuildableName = "libyoga.a"
+               BlueprintName = "yoga"
+               ReferencedContainer = "container:../../node_modules/react-native/React/React.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -17,7 +31,7 @@
                BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
                BuildableName = "libReact.a"
                BlueprintName = "React"
-               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
+               ReferencedContainer = "container:../../node_modules/react-native/React/React.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry

scripts/test.e2e.android.js

@@ -6,14 +6,9 @@ function run() {
     return;
   }
 
-  try {
-    exec.execSync(`echo 'travis_fold:start:android-e2e'`);
-    exec.execSync(`yarn run uninstall-android`);
-    exec.execSync(`yarn run install-android`);
-    exec.execSync(`cd AndroidE2E && ./gradlew connectedDebugAndroidTest`);
-  } finally {
-    exec.execSync(`echo 'travis_fold:end:android-e2e'`);
-  }
+  exec.execSync(`yarn run uninstall-android`);
+  exec.execSync(`yarn run install-android`);
+  exec.execSync(`cd AndroidE2E && ./gradlew connectedDebugAndroidTest`);
 }
 
 run();

scripts/test.e2e.ios.js

@@ -6,7 +6,6 @@ const release = _.includes(process.argv, 'release');
 function buildProjForDetox() {
   const scheme = release ? `playground_release` : `playground`;
 
-  shellUtils.exec.execSync(`echo 'travis_fold:start:xcodebuild'`);
   const cmd = `RCT_NO_LAUNCH_PACKAGER=true
           cd ./playground/ios && xcodebuild
             -scheme ${scheme}
@@ -20,7 +19,6 @@ function buildProjForDetox() {
   } else {
     shellUtils.exec.execSync(`${cmd}`);
   }
-  shellUtils.exec.execSync(`echo 'travis_fold:end:xcodebuild'`);
 }
 function isInstalled(what) {
   try {
@@ -32,7 +30,6 @@ function isInstalled(what) {
 
 function e2e() { //eslint-disable-line
   try {
-    shellUtils.exec.execSync(`echo 'travis_fold:start:detox-ios'`);
     shellUtils.exec.execSyncSilent(`watchman watch-del-all || true`);
     const detoxAppBuildPath = `playground/ios/DerivedData/playground/Build/Products/${release ? 'Release' : 'Debug'}-iphonesimulator/playground.app`;
 
@@ -48,7 +45,6 @@ function e2e() { //eslint-disable-line
       shellUtils.exec.kill(`CoreSimulator`);
       shellUtils.exec.execSync(`sleep 5`);
     }
-    shellUtils.exec.execSync(`echo 'travis_fold:end:detox-ios'`);
   }
 }
 

scripts/test.unit.ios.js

@@ -17,24 +17,19 @@ function hasXcpretty() {
 }
 
 function run() {
-  try {
-    shellUtils.exec.execSync(`echo 'travis_fold:start:xcodeunit'`);
-    runWithXcprettyIfPossible(`RCT_NO_LAUNCH_PACKAGER=true
+  runWithXcprettyIfPossible(`RCT_NO_LAUNCH_PACKAGER=true
           cd ./playground/ios && xcodebuild
             build build-for-testing
             -scheme "playground"
             -project playground.xcodeproj
             -sdk iphonesimulator
             -configuration Debug`);
-    runWithXcprettyIfPossible(`RCT_NO_LAUNCH_PACKAGER=true
+  runWithXcprettyIfPossible(`RCT_NO_LAUNCH_PACKAGER=true
           cd ./playground/ios && xcodebuild
             test-without-building
             -scheme "playground"
             -project playground.xcodeproj
             -destination 'platform=iOS Simulator,name=iPhone 7'`);
-  } finally {
-    shellUtils.exec.execSync(`echo 'travis_fold:end:xcodeunit'`);
-  }
 }
 
 run();

scripts/travis.sh

@@ -21,6 +21,8 @@ run_f () {
 
 run_f "yarn install"
 run_f "yarn run test-js"
-run_f "yarn run test-android"
-run_f "yarn run test-ios"
+run_f "yarn run test-unit-android"
+run_f "yarn run test-unit-ios"
+run_f "yarn run test-e2e-android"
+run_f "yarn run test-e2e-ios"
 run_f "yarn run release"