From b26f2cccc1fb855292afd848f54ea4d46ec6c8a0 Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Wed, 5 May 2021 17:10:48 -0700 Subject: [PATCH] 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 | 22 ++++++++++++---------- tool/flutter_ci_script_dev.sh | 29 ++++++++++++++++++----------- tool/flutter_ci_script_shared.sh | 4 ++-- tool/flutter_ci_script_stable.sh | 19 +++++++++---------- 4 files changed, 41 insertions(+), 33 deletions(-) diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh index ea497e278..2c7c2302f 100755 --- a/tool/flutter_ci_script_beta.sh +++ b/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[@]}" diff --git a/tool/flutter_ci_script_dev.sh b/tool/flutter_ci_script_dev.sh index 8abda7d21..f8f8e4553 100755 --- a/tool/flutter_ci_script_dev.sh +++ b/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[@]}" diff --git a/tool/flutter_ci_script_shared.sh b/tool/flutter_ci_script_shared.sh index 0933e0f02..da1bd7529 100644 --- a/tool/flutter_ci_script_shared.sh +++ b/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 -} \ No newline at end of file +} diff --git a/tool/flutter_ci_script_stable.sh b/tool/flutter_ci_script_stable.sh index 0c5f3fa7e..db27f46c8 100755 --- a/tool/flutter_ci_script_stable.sh +++ b/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[@]}"