Simplify CircleCI config (#282)

Author: charpeni

.circleci/config.yml

@@ -3,38 +3,49 @@ version: 2.1
 aliases:
   - &save-cache-yarn
     save_cache:
-      key: v1-yarn-packages-{{ checksum "yarn.lock" }}
+      key: yarn-packages-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
       paths:
         - ~/.cache/yarn
   - &restore-cache-yarn
     restore_cache:
       name: Restore Yarn Package Cache
       keys:
-        - v1-yarn-packages-{{ checksum "yarn.lock" }}
-  - &save-cache-detox
+        - yarn-packages-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
+  - &save-cache-detox-env
     save_cache:
-      key: v1-detox-{{ checksum "yarn.lock"}}
+      key: detox-env-{{ .Environment.CACHE_VERSION }}-{{ arch }}-{{ .Environment.CIRCLE_WORKING_DIRECTORY }}
+      paths:
+        - /usr/local/Homebrew
+        - ~/Library/Caches/Homebrew
+  - &restore-cache-detox-env
+    restore_cache:
+      name: Restoring Detox Env Cache
+      keys:
+        - detox-env-{{ .Environment.CACHE_VERSION }}-{{ arch }}-{{ .Environment.CIRCLE_WORKING_DIRECTORY }}
+  - &save-cache-detox-app
+    save_cache:
+      key: detox-app-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock"}}
       paths:
         - node_modules
         - ios/Pods
-  - &restore-cache-detox
+  - &restore-cache-detox-app
     restore_cache:
-      name: Restoring Detox Cache
+      name: Restoring Detox App Cache
       keys:
-        - v1-detox-{{ checksum "yarn.lock"}}
+        - detox-app-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock"}}
   - &save-android-build-cache
     save_cache:
       paths:
         - ~/.gradle/caches
         - ~/.gradle/wrapper
         - ~/.android/build-cache
-      key: v1-gradle-build-cache-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }}-{{ checksum "yarn.lock" }}
+      key: gradle-build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }}-{{ checksum "yarn.lock" }}
       when: always # Ensures build assets are cached even on failed builds
   - &restore-android-build-cache
     restore_cache:
       name: Restoring Android & Gradle cache
       keys:
-        - v1-gradle-build-cache-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }}-{{ checksum "yarn.lock" }}
+        - gradle-build-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }}-{{ checksum "yarn.lock" }}
   - &attach-workspace
     attach_workspace:
       at: ~/react-native-url-polyfill
@@ -46,7 +57,7 @@ executors:
     working_directory: ~/react-native-url-polyfill
   xcode-11:
     macos:
-      xcode: 11
+      xcode: 11.7.0
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 1
   xcode-12:
@@ -73,48 +84,22 @@ commands:
             yarn install --frozen-lockfile --no-progress --non-interactive --cache-folder ~/.cache/yarn
   install-detox:
     steps:
+      - *restore-cache-detox-env
       - run:
           name: Install Detox
           command: |
-            brew update
             brew tap wix/brew
             brew install applesimutils
             yarn global add detox-cli
       - run:
           name: Clean Detox
           command: |
             detox clean-framework-cache && detox build-framework-cache
-  test-detox-ios:
-    steps:
-      - *attach-workspace
-      - *restore-cache-detox
-      - install-yarn-dependencies
-      - install-detox
-      - run:
-          name: Install Pods
-          command: |
-            curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
-            cd ios && pod install --repo-update
-      - run:
-          name: Run Detox on iOS
-          command: yarn e2e:ios
-      - *save-cache-detox
-  test-hermes-android:
-    steps:
-      - *attach-workspace
-      - *restore-android-build-cache
-      - install-yarn-dependencies
-      - run:
-          name: Enable Hermes
-          command: sed -i "s/enableHermes:\sfalse/enableHermes:\ true/g" android/app/build.gradle
-      - run:
-          name: Build APK
-          command: cd android && ./gradlew assembleRelease
-      - *save-android-build-cache
+      - *save-cache-detox-env
   test-hermes-ios:
     steps:
       - *attach-workspace
-      - *restore-cache-detox
+      - *restore-cache-detox-app
       - run:
           name: Enable Hermes
           command: npx shx sed -i "s/:hermes_enabled\s=>\sfalse/:hermes_enabled => true/g" ios/Podfile
@@ -144,7 +129,8 @@ jobs:
       - *save-cache-yarn
       - persist_to_workspace:
           root: .
-          paths: .
+          paths:
+            - .
   lint:
     executor: default
     steps:
@@ -159,36 +145,58 @@ jobs:
       - run:
           name: Run Jest
           command: yarn test
-  rn-0-60-test-ios:
-    executor: xcode-11
-    working_directory: ~/react-native-url-polyfill/detox/rn-0.60
-    steps:
-      - test-detox-ios
-  rn-0-63-test-ios:
-    executor: xcode-11
-    working_directory: ~/react-native-url-polyfill/detox/rn-0.63
+  test-ios:
+    parameters:
+      executor:
+        default: xcode-12
+        type: executor
+      react-native-version:
+        type: string
+    executor: << parameters.executor >>
+    working_directory: ~/react-native-url-polyfill/detox/rn-<< parameters.react-native-version >>
     steps:
-      - test-detox-ios
-  rn-0-63-test-hermes-android:
+      - *attach-workspace
+      - *restore-cache-detox-app
+      - install-yarn-dependencies
+      - install-detox
+      - run:
+          name: Fetch Pods specs
+          command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
+      - run:
+          name: Install Pods
+          command: cd ios && pod install --repo-update
+      - run:
+          name: Run Detox on iOS
+          command: yarn e2e:ios
+      - *save-cache-detox-app
+  test-hermes-android:
+    parameters:
+      react-native-version:
+        type: string
     executor: android
-    working_directory: ~/react-native-url-polyfill/detox/rn-0.63
-    steps:
-      - test-hermes-android
-  rn-0-64-test-ios:
-    executor: xcode-12
-    working_directory: ~/react-native-url-polyfill/detox/rn-0.64
+    working_directory: ~/react-native-url-polyfill/detox/rn-<< parameters.react-native-version >>
     steps:
-      - test-detox-ios
-  rn-0-64-test-hermes-ios:
-    executor: xcode-12
-    working_directory: ~/react-native-url-polyfill/detox/rn-0.64
+      - *attach-workspace
+      - run:
+          name: Enable Hermes
+          command: sed -i "s/enableHermes:\sfalse/enableHermes:\ true/g" android/app/build.gradle
+      - *restore-android-build-cache
+      - install-yarn-dependencies
+      - run:
+          name: Build APK
+          command: cd android && ./gradlew assembleRelease
+      - *save-android-build-cache
+  test-hermes-ios:
+    parameters:
+      executor:
+        default: xcode-12
+        type: executor
+      react-native-version:
+        type: string
+    executor: << parameters.executor >>
+    working_directory: ~/react-native-url-polyfill/detox/rn-<< parameters.react-native-version >>
     steps:
       - test-hermes-ios
-  rn-0-64-test-hermes-android:
-    executor: android
-    working_directory: ~/react-native-url-polyfill/detox/rn-0.64
-    steps:
-      - test-hermes-android
 
 workflows:
   tests:
@@ -200,27 +208,30 @@ workflows:
       - test-js:
           requires:
             - checkout
-      - rn-0-60-test-ios:
-          requires:
-            - lint
-            - test-js
-      - rn-0-63-test-ios:
+      - test-ios:
+          name: test-ios-0.60
+          executor: xcode-11
+          react-native-version: '0.60'
           requires:
             - lint
             - test-js
-      - rn-0-63-test-hermes-android:
+      - test-ios:
+          matrix:
+            parameters:
+              react-native-version: ['0.63', '0.64']
           requires:
             - lint
             - test-js
-      - rn-0-64-test-ios:
+      - test-hermes-ios:
+          matrix:
+            parameters:
+              react-native-version: ['0.64']
           requires:
-            - lint
-            - test-js
-      - rn-0-64-test-hermes-ios:
-          requires:
-            - lint
-            - test-js
-      - rn-0-64-test-hermes-android:
+            - test-ios-<< matrix.react-native-version >>
+      - test-hermes-android:
+          matrix:
+            parameters:
+              react-native-version: ['0.63', '0.64']
           requires:
             - lint
             - test-js

detox/rn-0.63/ios/Podfile

@@ -17,10 +17,10 @@ target 'Detox' do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable these next few lines.
-  use_flipper!
-  post_install do |installer|
-    flipper_post_install(installer)
-  end
+  # use_flipper!
+  # post_install do |installer|
+  #   flipper_post_install(installer)
+  # end
 end
 
 target 'Detox-tvOS' do