merged with Main

.circleci/config.base.yml

@@ -17,10 +17,7 @@ node12: &node12
 defaults: &defaults
   working_directory: ~/repo
   docker:
-    - image: ${AWS_ECR_ACCOUNT_URL}/amplify-cli-e2e-base-image-repo:latest
-      aws_auth:
-        aws_access_key_id: $ECR_ACCESS_KEY
-        aws_secret_access_key: $ECR_SECRET_ACCESS_KEY
+    - image: ${AWS_ECR_ACCOUNT_URL}/amplify-cli-e2e-base-image-repo-public:latest
   resource_class: large
 
 clean_e2e_resources: &clean_e2e_resources
@@ -526,7 +523,7 @@ jobs:
           path: /root/aws-amplify-cypress-api/cypress/screenshots
 
   deploy:
-    <<: *defaults
+    <<: *node12
     steps:
       - attach_workspace:
           at: ./
@@ -539,13 +536,7 @@ jobs:
       - run:
           name: Publish Amplify CLI
           command: |
-            if [ -z "$CIRCLE_PULL_REQUEST" ]; then
-              git config --global user.email $GITHUB_EMAIL
-              git config --global user.name $GITHUB_USER
-              npm run publish:$CIRCLE_BRANCH
-            else
-              echo "Skipping deploy."
-            fi
+            bash ./.circleci/publish.sh
       - run: *scan_e2e_test_artifacts
   github_prerelease:
     <<: *node12
@@ -694,8 +685,8 @@ workflows:
             branches:
               only:
                 - master
-                - func-env-vars-secrets
-                - iterative-update
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - build
             - mock_e2e_tests
@@ -707,8 +698,9 @@ workflows:
             branches:
               only:
                 - master
-                - func-env-vars-secrets
                 - beta
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - build
             - mock_e2e_tests
@@ -717,12 +709,10 @@ workflows:
             branches:
               only:
                 - master
-                - func-env-vars-secrets
                 - beta
-                - backendManager
-                - iterative-update
                 - release
-                - compute-functions
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - build
       - build_pkg_binaries:
@@ -736,6 +726,8 @@ workflows:
             branches:
               only:
                 - master
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
       - amplify_e2e_tests:
           context:
             - amplify-ecr-image-pull
@@ -748,9 +740,8 @@ workflows:
             branches:
               only:
                 - master
-                - func-env-vars-secrets
-                - compute-functions
-                - iterative-update
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - publish_to_local_registry
       - done_with_node_e2e_tests:
@@ -768,6 +759,8 @@ workflows:
             branches:
               only:
                 - master
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - done_with_node_e2e_tests
             - build_pkg_binaries
@@ -784,6 +777,8 @@ workflows:
             branches:
               only:
                 - master
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - build
       - amplify_migration_tests_v4:
@@ -796,7 +791,8 @@ workflows:
             branches:
               only:
                 - master
-                - func-env-vars-secrets
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - build
       - amplify_migration_tests_v4_30_0:
@@ -809,10 +805,8 @@ workflows:
             branches:
               only:
                 - master
-                - func-env-vars-secrets
-                - graphqlschemae2e
-                - feat-import
-                - test-fix-status
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - build
       - amplify_migration_tests_non_multi_env_layers:
@@ -825,7 +819,8 @@ workflows:
             branches:
               only:
                 - master
-                - func-env-vars-secrets
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - build
       - amplify_migration_tests_multi_env_layers:
@@ -838,7 +833,8 @@ workflows:
             branches:
               only:
                 - master
-                - func-env-vars-secrets
+                - /tagged-release\/.*/
+                - /run-e2e\/*./
           requires:
             - build
       - amplify_console_integration_tests:
@@ -892,6 +888,11 @@ workflows:
           filters:
             branches:
               only:
+                - release
+                - master
+                - beta
+                - /tagged-release\/.*/
+                - /tagged-release-without-e2e-tests\/.*/
                 - ext
       - github_release:
           context: github-publish
@@ -901,3 +902,4 @@ workflows:
             branches:
               only:
                 - release
+