Merge branch 'main' into fix/analytics-buffer

aws-amplify · Jun 24, 2022 · d9a222f · d9a222f
2 parents 31244f4 + 9cca114
commit d9a222f
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1687,20 +1687,26 @@ workflows:
           name: RN iOS - latest
           framework: rn_ios
           main-file-path: ./App.js
+          # TODO: delete next line after https://github.com/react-native-picker/picker/issues/425 is resolved
+          tag: 0.68.2
       - getting-started-smoke-test/rn-android:
           name: RN Android - latest
           framework: rn_android
           main-file-path: ./App.js
-      - getting-started-smoke-test/rn-ios:
-          name: RN iOS - next
-          framework: rn_ios
-          main-file-path: ./App.js
-          tag: next
-      - getting-started-smoke-test/rn-android:
-          name: RN Android - next
-          framework: rn_android
-          main-file-path: ./App.js
-          tag: next
+          # TODO: delete next line after https://github.com/react-native-picker/picker/issues/425 is resolved
+          tag: 0.68.2
+
+      # TODO: re-enable the following 2 jobs after https://github.com/react-native-picker/picker/issues/425 is resolved
+      # - getting-started-smoke-test/rn-ios:
+      #     name: RN iOS - next
+      #     framework: rn_ios
+      #     main-file-path: ./App.js
+      #     tag: next
+      # - getting-started-smoke-test/rn-android:
+      #     name: RN Android - next
+      #     framework: rn_android
+      #     main-file-path: ./App.js
+      #     tag: next
       # Expo
       - getting-started-smoke-test/expo:
           name: Expo - latest
@@ -1860,7 +1866,7 @@ orbs:
           - run-with-retry:
               label: Scaffold App
               pre-command: cd ../ && rm -rf amplify_getting_started_<< parameters.framework >>
-              command: npx react-native@<< parameters.tag >> init amplify_getting_started_<< parameters.framework >>
+              command: npx react-native@<< parameters.tag >> init amplify_getting_started_<< parameters.framework >> --version << parameters.tag >>
               no_output_timeout: 10m
           - run-with-retry:
               label: Install Amplify dependencies
@@ -1912,7 +1918,7 @@ orbs:
           - run-with-retry:
               label: Scaffold App
               pre-command: cd ../ && rm -rf amplify_getting_started_<< parameters.framework >>
-              command: npx react-native@<< parameters.tag >> init amplify_getting_started_<< parameters.framework >>
+              command: npx react-native@<< parameters.tag >> init amplify_getting_started_<< parameters.framework >> --version << parameters.tag >>
               no_output_timeout: 10m
           - run-with-retry:
               label: Install Amplify dependencies