ci: use macos executor for deploy job (aws-amplify#6433)

abdielou · Jul 28, 2020 · a913383 · a913383
1 parent 5cc818b
commit a913383
Showing 1 changed file with 6 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,11 +17,7 @@ executors:
       - image: verdaccio/verdaccio
     resource_class: large
 
-  android-executor:
-    macos:
-      xcode: 11.4.1
-
-  ios-executor:
+  macos-executor:
     macos:
       xcode: 11.4.1
 
@@ -323,11 +319,6 @@ jobs:
       - run: yarn --frozen-lockfile
       - run: yarn run bootstrap
       - run: yarn run build
-
-      - save_cache:
-          key: amplify-ssh-deps-{{ .Branch }}
-          paths:
-            - ~/.ssh
       - persist_to_workspace:
           root: /root
           paths:
@@ -544,36 +535,32 @@ jobs:
           spec: custom-authenticator
 
   integ_rn_ios_storage:
-    executor: ios-executor
+    executor: macos-executor
     <<: *test_env_vars
     working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
     steps:
       - integ_test_rn_ios
 
   integ_rn_ios_push_notifications:
-    executor: ios-executor
+    executor: macos-executor
     <<: *test_env_vars
     working_directory: ~/amplify-js-samples-staging/samples/react-native/push-notifications/PushNotificationApp
     steps:
       - integ_test_rn_ios
 
   integ_rn_android_storage:
-    executor: android-executor
+    executor: macos-executor
     <<: *test_env_vars
     working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
     steps:
       - integ_test_rn_android
 
   deploy:
-    executor: build-executor
+    executor: macos-executor
     working_directory: ~/amplify-js
     steps:
       - attach_workspace:
-          at: /root
-      - restore_cache:
-          keys:
-            - amplify-ssh-deps-{{ .Branch }}
-            - amplify-ssh-deps
+          at: ~/
       - run:
           name: 'Publish to Amplify Package'
           command: |
@@ -594,10 +581,6 @@ jobs:
     steps:
       - attach_workspace:
           at: /root
-      - restore_cache:
-          keys:
-            - amplify-ssh-deps-{{ .Branch }}
-            - amplify-ssh-deps
       - run:
           name: 'Post-release steps'
           command: |