back to trying to run ARM

.travis.yml

@@ -13,10 +13,16 @@ branches:
   - master
   - v2
 
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
     - $YARN_CACHE
     - $HOME/.m2
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
 
 install:
         # node:

scripts/env/installAndroidSDK.sh

@@ -18,12 +18,12 @@ echo "Copying Android Licenses"
 mkdir -p "${ANDROID_HOME}"/licenses
 cp "$scriptdir/android-sdk-licenses/"* "${ANDROID_HOME}"/licenses
 
-package="system-images;android-24;default;x86"
+package="system-images;android-24;default;armeabi_v7a"
 echo "Downloading emulator"
 sdkmanager "emulator"
 echo "Downloading $package"
 sdkmanager "${package}"
 echo "Creating avd"
-echo no | avdmanager create avd --force --name "pixel" --abi "default/x86" --package "${package}" --device "pixel"
+echo no | avdmanager create avd --force --name "pixel" --abi "default/armeabi_v7a" --package "${package}" --device "pixel"
 sleep 2
 avdmanager list avd

scripts/test.e2e.android.js

@@ -9,7 +9,6 @@ run();
 function run() {
   if (process.env.CI) {
     try {
-      // console.log(`android e2e disabled on CI for now`);
       launchEmulator();
       runTests();
     } finally {
@@ -21,15 +20,14 @@ function run() {
 }
 
 function runTests() {
-  console.log('all OK');
-  // exec.execSync(`yarn run uninstall-android`);
-  // exec.execSync(`yarn run install-android ${release ? '-- release' : ''}`);
-  // exec.execSync(`cd AndroidE2E && ./gradlew connectedDebugAndroidTest`);
+  exec.execSync(`yarn run uninstall-android`);
+  exec.execSync(`yarn run install-android ${release ? '-- release' : ''}`);
+  exec.execSync(`cd AndroidE2E && ./gradlew connectedDebugAndroidTest`);
 }
 
 function launchEmulator() {
   console.log(`Launching Android Emulator`);
-  exec.execSync(`cd $ANDROID_HOME/tools && ./emulator -skin 1080x1920 -gpu host -no-audio @pixel`);
+  exec.execSync(`cd $ANDROID_HOME/tools && ./emulator -skin 1080x1920 -no-audio @pixel`);
   exec.execSync(`./scripts/waitForAndroidEmulator.sh`);
 }
 

scripts/travis.sh

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