From 545614654f7561f5bd6021ef027f20c9def8d3f3 Mon Sep 17 00:00:00 2001
From: Carlos Garcia <fluiddot@gmail.com>
Date: Thu, 16 Feb 2023 11:01:11 +0100
Subject: [PATCH] Unify the full test suite jobs automatically triggered

---
 .circleci/config.yml | 50 ++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c65e411563..43a37cb644 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -397,6 +397,9 @@ workflows:
           name: Test Android on Device - Canaries
           is-canary: "-canary"
           requires: [ "Test Android", "Android Native Unit Tests", "Android Build" ]
+      - android-native-unit-tests:
+          name: Android Native Unit Tests
+      # For regular branches the full test suite is optional.
       - Optional UI Tests:
           type: approval
           filters:
@@ -406,7 +409,7 @@ workflows:
                 - /^dependabot/submodules/.*/
                 - /^release.*/
       - ios-device-checks:
-          name: Test iOS on Device - Full
+          name: Test iOS on Device - Full (Manually triggered)
           requires: [ "Optional UI Tests", "Test iOS", "iOS Build" ]
           filters:
             branches:
@@ -415,7 +418,7 @@ workflows:
                 - /^dependabot/submodules/.*/
                 - /^release.*/
       - android-device-checks:
-          name: Test Android on Device - Full
+          name: Test Android on Device - Full (Manually triggered)
           requires: [ "Optional UI Tests", "Test Android", "Android Native Unit Tests", "Android Build" ]
           filters:
             branches:
@@ -423,51 +426,24 @@ workflows:
                 - trunk
                 - /^dependabot/submodules/.*/
                 - /^release.*/
-      - android-native-unit-tests:
-          name: Android Native Unit Tests
+      # For `trunk`, Dependabot, and release branches we always run the full test suite.
       - ios-device-checks:
-          name: Test iOS on Device - Full (Submodule Update)
-          post-to-slack: true
-          requires: [ "Test iOS", "iOS Build" ]
-          filters:
-            branches:
-              only: /^dependabot/submodules/.*/
-      - android-device-checks:
-          name: Test Android on Device - Full (Submodule Update)
-          post-to-slack: true
-          requires: [ "Test Android", "Android Native Unit Tests", "Android Build" ]
-          filters:
-            branches:
-              only: /^dependabot/submodules/.*/
-      - ios-device-checks:
-          name: Test iOS on Device - Full (On Trunk)
+          name: Test iOS on Device - Full
           post-to-slack: true
           requires: [ "Test iOS", "iOS Build" ]
           filters:
             branches:
               only:
                 - trunk
-      - android-device-checks:
-          name: Test Android on Device - Full (On Trunk)
-          post-to-slack: true
-          requires: [ "Test Android", "Android Native Unit Tests", "Android Build" ]
-          filters:
-            branches:
-              only:
-                - trunk
-      - ios-device-checks:
-          name: Test iOS on Device - Full (Release)
-          post-to-slack: true
-          requires: [ "Test iOS", "iOS Build" ]
-          filters:
-            branches:
-              only: 
+                - /^dependabot/submodules/.*/
                 - /^release.*/
       - android-device-checks:
-          name: Test Android on Device - Full (Release)
+          name: Test Android on Device - Full
           post-to-slack: true
           requires: [ "Test Android", "Android Native Unit Tests", "Android Build" ]
           filters:
             branches:
-              only:
-                - /^release.*/
+              only: 
+                - trunk
+                - /^dependabot/submodules/.*/
+                - /^release.*/
\ No newline at end of file