Simplify Detox cache

charpeni · Mar 6, 2020 · 4c7047b · 4c7047b
1 parent 12f547a
commit 4c7047b
Showing 1 changed file with 8 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,26 +9,17 @@ aliases:
       name: Restore Yarn Package Cache
       keys:
         - v1-yarn-packages-{{ checksum "yarn.lock" }}
-  - &save-cache-detox-pods
+  - &save-cache-detox
     save_cache:
-      key: v1-detox-pods-{{ checksum "yarn.lock"}}
-      paths:
-        - ios/Pods
-  - &restore-cache-detox-pods
-    restore_cache:
-      name: Restoring Detox Pods Cache
-      keys:
-        - v1-detox-pods-{{ checksum "yarn.lock"}}
-  - &save-cache-detox-yarn
-    save_cache:
-      key: v1-detox-yarn-{{ checksum "yarn.lock"}}
+      key: v1-detox-{{ checksum "yarn.lock"}}
       paths:
         - node_modules
-  - &restore-cache-detox-yarn
+        - ios/Pods
+  - &restore-cache-detox
     restore_cache:
-      name: Restoring Detox Yarn Package Cache
+      name: Restoring Detox Cache
       keys:
-        - v1-detox-yarn-{{ checksum "yarn.lock"}}
+        - v1-detox-{{ checksum "yarn.lock"}}
   - &save-android-build-cache
     save_cache:
       paths:
@@ -100,16 +91,14 @@ jobs:
     <<: *ios
     steps:
       - *attach-workspace
-      - *restore-cache-detox-yarn
-      - *restore-cache-detox-pods
+      - *restore-cache-detox
       - run:
           name: Yarn version
           command: yarn -v
       - run:
           name: Yarn Install
           command: |
             yarn install --frozen-lockfile --no-progress --non-interactive --cache-folder ~/.cache/yarn
-      - *save-cache-detox-yarn
       - run:
           name: Install Detox
           command: |
@@ -124,15 +113,14 @@ jobs:
       - run:
           name: Install Pods
           command: cd ios && pod install
-      - *save-cache-detox-pods
       - run:
           name: Run Detox on iOS
           command: yarn e2e:ios
+      - *save-cache-detox
   test-hermes:
     <<: *android
     steps:
       - *attach-workspace
-      - *restore-cache-detox-yarn
       - *restore-android-build-cache
       - run:
           name: Yarn version
@@ -141,7 +129,6 @@ jobs:
           name: Yarn Install
           command: |
             yarn install --frozen-lockfile --no-progress --non-interactive --cache-folder ~/.cache/yarn
-      - *save-cache-detox-yarn
       - run:
           name: Enable Hermes
           command: sed -i "s/enableHermes:\sfalse/enableHermes:\ true/g" android/app/build.gradle