Merge pull request #1501 from pillarwallet/chore/update_android-api-i…

…mage Chore/update android api image
pillarwallet · Nov 1, 2019 · 2f7a8bb · 2f7a8bb
2 parents 22363c6 + 1a6aa47
commit 2f7a8bb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,7 +20,7 @@ executors:
     working_directory: ~/pillarwallet
     resource_class: large
     docker:
-      - image: circleci/android:api-26-node8-alpha
+      - image: circleci/android:api-29-node
     environment:
       TERM: dumb
       _JAVA_OPTIONS: "-Xmx3072m -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
@@ -33,6 +33,15 @@ executors:
     docker:
       - image: circleci/openjdk:8-node-browsers
 
+  node10-executor:
+    working_directory: ~/pillarwallet
+    docker:
+      - image: circleci/node:10.14
+    environment:
+      NODE_OPTIONS: "--max-old-space-size=4096"
+    resource_class: large
+    shell: /bin/bash --login -o pipefail
+
 aliases:
   - &restore_pod_cache
     restore_cache:
@@ -153,7 +162,7 @@ aliases:
 
 jobs:
   build-and-test:
-    executor: ios-executor
+    executor: node10-executor
     steps:
       - checkout
       - run:

diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "generate:ios:ipa": "mkdir  ./ios/build/Build/Products/Release-iphoneos/Payload && cp -R ./ios/build/Build/Products/Release-iphoneos/pillarwallet.app ./ios/build/Build/Products/Release-iphoneos/Payload && cd ./ios/build/Build/Products/Release-iphoneos/ && /usr/bin/zip -r  pillarwallet.ipa Payload && rm -rf Payload && mv pillarwallet.ipa ../../../..",
     "build:ios": "react-native bundle --entry-file='index.js' --bundle-output='./ios/pillarwallet/main.jsbundle' --dev=false --platform='ios' --assets-dest='./ios'",
     "build:android": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res",
-    "test": "jest",
+    "test": "jest --maxWorkers=10",
     "test:coverage": "jest --coverage",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
@@ -289,4 +289,4 @@
     "tty": "tty-browserify",
     "tls": false
   }
-}
+}
diff --git a/src/actions/__tests__/connectionKeyPairActions.test.js b/src/actions/__tests__/connectionKeyPairActions.test.js
@@ -284,6 +284,7 @@ describe('ConnectionKeyPair actions', () => {
   });
 
   beforeEach(() => {
+    jest.useFakeTimers();
     const connectionKeyPairsStoreMock = {
       connectionKeyPairs: {
         data: [...connectionKeyPairsMock],