circle v2.1 config

Author: Krzysztof Borowy

.circleci/config.yml

@@ -165,77 +165,77 @@ jobs:
     <<: *js_defaults
     steps:
       - checkout
-      - restore-cache: *cache_restore_yarn
+      - restore_cache: *cache_restore_yarn
       - run:
           name: Install dependencies
           command: yarn --pure-lockfile --non-interactive --cache-folder ~/.cache/yarn
-      - save-cache: *cache_save_yarn
+      - save_cache: *cache_save_yarn
       - persist_to_workspace:
           root: .
           paths: .
 
-  "Test: lint":
+  "Test lint":
     <<: *js_defaults
     steps:
       - *addWorkspace
       - run:
           name: Lint check
           command: yarn test:lint
 
-  "Test: flow":
+  "Test flow":
     <<: *js_defaults
     steps:
       - *addWorkspace
       - run:
           name: Flow check
           command: yarn test:flow
 
-  "Test: Android unit":
+  "Test Android unit":
     <<: *android_defaults
     steps:
       - *addWorkspace
-      - restore-cache: *cache_restore_yarn
+      - restore_cache: *cache_restore_yarn
       - run:
           name: Installing Yarn dependencies
           command: yarn --pure-lockfile --non-interactive --cache-folder ~/.cache/yarn
-      - save-cache: *cache_save_yarn
-      - restore-cache: *cache_restore_gradle
+      - save_cache: *cache_save_yarn
+      - restore_cache: *cache_restore_gradle
       - run:
           name: Downloading Gradle dependencies
           working_directory: example/android
           command: ./gradlew --max-workers 2 fetchDependencies
-      - save-cache: *cache_save_gradle
+      - save_cache: *cache_save_gradle
       - run:
           name: Next storage tests
           working_directory: example/android
           command: ./gradlew react-native-async-storage_async-storage:test
 
-  "Test: iOS e2e":
+  "Test iOS e2e":
     <<: *macos_defaults
     steps:
       - *addWorkspace
-      - restore-cache: *cache_restore_brew_ios
+      - restore_cache: *cache_restore_brew_ios
       - run:
           name: Configure macOS Environment
           command: |
             brew bundle --file=.circleci/Brewfile.ios --no-lock
             touch .watchmanconfig
             echo Node $(node --version)
-      - save-cache: *cache_save_brew_ios
-      - restore-cache: *cache_restore_yarn
+      - save_cache: *cache_save_brew_ios
+      - restore_cache: *cache_restore_yarn
       - run:
           name: Installing Yarn dependencies
           command: yarn --pure-lockfile --non-interactive --cache-folder ~/.cache/yarn
-      - save-cache: *cache_save_yarn
-      - restore-cache: *cache_restore_pods
+      - save_cache: *cache_save_yarn
+      - restore_cache: *cache_restore_pods
       - run:
           name: Bundle JS
           command: yarn bundle:ios --dev false
       - run:
           name: Install pod dependencies
           working_directory: example/ios
           command: pod install
-      - save-cache: *cache_save_pods
+      - save_cache: *cache_save_pods
       - run:
           name: Boot simulator
           background: true
@@ -247,7 +247,7 @@ jobs:
           name: Run e2e tests
           command: yarn test:e2e:ios
 
-  "Build: Android release apk":
+  "Build Android release apk":
     <<: *android_defaults
     steps:
       - *addWorkspace
@@ -266,18 +266,18 @@ jobs:
           paths:
             - example/android/app/build/outputs/apk/*
 
-  "Test: Android e2e":
+  "Test Android e2e":
     <<: *macos_defaults_android
     steps:
       - run_android_e2e:
           testScript: "test:e2e:android"
 
-  "Test: Android e2e Next":
+  "Test Android e2e Next":
     <<: *macos_defaults_android
     steps:
       - run_android_e2e
 
-  "Build: Prepare android e2e environment":
+  "Prepare android e2e environment":
     <<: *macos_defaults_android
     steps:
       - *addWorkspace
@@ -290,13 +290,13 @@ jobs:
             echo 'export QEMU_AUDIO_DRV=none' >> $BASH_ENV
             echo 'export JAVA_HOME=$(/usr/libexec/java_home)' >> $BASH_ENV
             source $BASH_ENV
-      - restore-cache: *cache_restore_brew_android
+      - restore_cache: *cache_restore_brew_android
       - run:
           name: Install Android SDK tools
           command: |
             brew update --preinstall
             brew bundle --file=.circleci/Brewfile.android --no-lock
-      - save-cache: *cache_save_brew_android
+      - save_cache: *cache_save_brew_android
       - run:
           name: Install Android emulator
           shell: /bin/bash -e
@@ -317,7 +317,9 @@ jobs:
                    -d "pixel"
       - persist_to_workspace:
           root: .
-          paths: .
+          paths:
+            - /usr/local/share/android-sdk
+            - ~/.android
 
   Release:
     <<: *js_defaults
@@ -335,38 +337,38 @@ workflows:
   "Testing":
     jobs:
       - "Setup environment"
-      - "Test: lint":
+      - "Test lint":
           requires:
             - "Setup environment"
-      - "Test: flow":
+      - "Test flow":
           requires:
             - "Setup environment"
-      - "Test: Android unit":
+      - "Test Android unit":
           requires:
             - "Setup environment"
-      - "Test: iOS e2e":
+      - "Test iOS e2e":
           requires:
-            - "Test: lint"
-            - "Test: flow"
-      - "Build: Android release apk":
+            - "Test lint"
+            - "Test flow"
+      - "Build Android release apk":
           requires:
-            - "Test: lint"
-            - "Test: flow"
-            - "Test: Android unit"
-      - "Build: Prepare android e2e environment":
+            - "Test lint"
+            - "Test flow"
+            - "Test Android unit"
+      - "Prepare android e2e environment":
           requires:
-            - "Build: Android release apk"
-      - "Test: Android e2e":
+            - "Build Android release apk"
+      - "Test Android e2e":
           requires:
-            - "Build: Prepare android e2e environment"
-      - "Test: Android e2e Next":
+            - "Prepare android e2e environment"
+      - "Test Android e2e Next":
           requires:
-            - "Build: Prepare android e2e environment"
+            - "Prepare android e2e environment"
       - "Release":
           requires:
-            - "Test: iOS e2e"
-            - "Test: Android e2e"
-            - "Test: Android e2e Next"
+            - "Test iOS e2e"
+            - "Test Android e2e"
+            - "Test Android e2e Next"
           filters:
             branches:
               only: master

scripts/android_e2e.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 INTERVAL=5 # 5 secs between each check
-MAX_RETRIES=60 # wait max 5 minutes for emu to boot
+MAX_RETRIES=12 # wait max 1 minute for emu to boot
 
 build_apk() {
   echo