Unbreaks dev and beta CI (#793)

* Unbreaking dev and beta CI

* Newline all the things.

* Unhooking desktop_photo_search from beta and dev CI

* Unhooking web_dashboard and veggieseasons as well

tool/flutter_ci_script_beta.sh

@@ -6,18 +6,24 @@ DIR="${BASH_SOURCE%/*}"
 source "$DIR/flutter_ci_script_shared.sh"
 
 declare -ar PROJECT_NAMES=(
+    "add_to_app/books/flutter_module_books"
     "add_to_app/fullscreen/flutter_module"
-    "add_to_app/prebuilt_module/flutter_module"
+    "add_to_app/multiple_flutters/multiple_flutters_module"
     "add_to_app/plugin/flutter_module_using_plugin"
-    "add_to_app/books/flutter_module_books"
-    # TODO(domesticmouse): tracking issue https://github.com/flutter/samples/issues/759 
-    # "add_to_app/multiple_flutters/multiple_flutters_module"
+    "add_to_app/prebuilt_module/flutter_module"
     "animations"
+    # TODO(redbrogdon): Restore during next beta branch merge.
+    # "experimental/desktop_photo_search"
+    "experimental/federated_plugin/federated_plugin"
+    # TODO(redbrogdon): Restore during next beta branch merge.
+    # "experimental/web_dashboard"
     "flutter_maps_firestore"
     "infinite_list"
     "ios_app_clip"
     "isolate_example"
     "jsonexample"
+    "null_safety/null_safe_app"
+    "null_safety/null_unsafe_app"
     "place_tracker"
     "platform_channels"
     "platform_design"
@@ -25,12 +31,8 @@ declare -ar PROJECT_NAMES=(
     "provider_counter"
     "provider_shopper"
     "testing_app"
-    "veggieseasons" 
-    "experimental/desktop_photo_search"
-    "experimental/federated_plugin/federated_plugin"
-    "null_safety/null_safe_app"
-    "null_safety/null_unsafe_app"
-    "experimental/web_dashboard"
+    # TODO(redbrogdon): Restore during next beta branch merge.
+    # "veggieseasons"
 )
 
 ci_projects "beta" "${PROJECT_NAMES[@]}"

tool/flutter_ci_script_dev.sh

@@ -6,17 +6,28 @@ DIR="${BASH_SOURCE%/*}"
 source "$DIR/flutter_ci_script_shared.sh"
 
 declare -ar PROJECT_NAMES=(
-    "add_to_app/fullscreen/flutter_module"
-    "add_to_app/prebuilt_module/flutter_module"
-    "add_to_app/plugin/flutter_module_using_plugin"
     "add_to_app/books/flutter_module_books"
+    "add_to_app/fullscreen/flutter_module"
     "add_to_app/multiple_flutters/multiple_flutters_module"
-    "animations"
+    "add_to_app/plugin/flutter_module_using_plugin"
+    "add_to_app/prebuilt_module/flutter_module"
+    # TODO(redbrogdon): Update once this PR makes it to release:
+    # https://github.com/flutter/flutter/pull/79860
+    # "animations"
+    # TODO(redbrogdon): Restore during next beta branch merge.
+    # "experimental/desktop_photo_search"
+    "experimental/federated_plugin/federated_plugin"
+    # TODO(redbrogdon): Restore during next beta branch merge.
+    # "experimental/web_dashboard"
     "flutter_maps_firestore"
     "infinite_list"
     "ios_app_clip"
-    "isolate_example"
+    # TODO(redbrogdon): Update once this PR makes it to release:
+    # https://github.com/flutter/flutter/pull/79860
+    # "isolate_example"
     "jsonexample"
+    "null_safety/null_safe_app"
+    "null_safety/null_unsafe_app"
     "place_tracker"
     "platform_channels"
     "platform_design"
@@ -24,12 +35,8 @@ declare -ar PROJECT_NAMES=(
     "provider_counter"
     "provider_shopper"
     "testing_app"
-    "veggieseasons" 
-    "experimental/desktop_photo_search"
-    "experimental/federated_plugin/federated_plugin"
-    "null_safety/null_safe_app"
-    "null_safety/null_unsafe_app"
-    "experimental/web_dashboard"
+    # TODO(redbrogdon): Restore during next beta branch merge.
+    # "veggieseasons"
 )
 
 ci_projects "dev" "${PROJECT_NAMES[@]}"

tool/flutter_ci_script_shared.sh

@@ -24,11 +24,11 @@ function ci_projects () {
         flutter format -n --set-exit-if-changed .
 
         # Run the actual tests.
-        if [ -d "test"]
+        if [ -d "test" ]
         then
             flutter test
         fi
 
         popd
     done
-}
+}

tool/flutter_ci_script_stable.sh

@@ -6,18 +6,22 @@ DIR="${BASH_SOURCE%/*}"
 source "$DIR/flutter_ci_script_shared.sh"
 
 declare -ar PROJECT_NAMES=(
+    "add_to_app/books/flutter_module_books"
     "add_to_app/fullscreen/flutter_module"
-    "add_to_app/prebuilt_module/flutter_module"
+    "add_to_app/multiple_flutters/multiple_flutters_module"
     "add_to_app/plugin/flutter_module_using_plugin"
-    "add_to_app/books/flutter_module_books"
-    # TODO(domesticmouse): tracking issue https://github.com/flutter/samples/issues/759 
-    # "add_to_app/multiple_flutters/multiple_flutters_module"
+    "add_to_app/prebuilt_module/flutter_module"
     "animations"
+    "experimental/desktop_photo_search"
+    "experimental/federated_plugin/federated_plugin"
+    "experimental/web_dashboard"
     "flutter_maps_firestore"
     "infinite_list"
     "ios_app_clip"
     "isolate_example"
     "jsonexample"
+    "null_safety/null_safe_app"
+    "null_safety/null_unsafe_app"
     "place_tracker"
     "platform_channels"
     "platform_design"
@@ -25,12 +29,7 @@ declare -ar PROJECT_NAMES=(
     "provider_counter"
     "provider_shopper"
     "testing_app"
-    "veggieseasons" 
-    "experimental/desktop_photo_search"
-    "experimental/federated_plugin/federated_plugin"
-    "null_safety/null_safe_app"
-    "null_safety/null_unsafe_app"
-    "experimental/web_dashboard"
+    "veggieseasons"
 )
 
 ci_projects "stable" "${PROJECT_NAMES[@]}"