From a17428ce6a495a99ca75be6a0e54b7040190b79b Mon Sep 17 00:00:00 2001 From: Michael Klimushyn Date: Thu, 5 Dec 2019 14:08:12 -0800 Subject: [PATCH 1/2] [none] Pass --custom-analysis flag through CI This passes our currently failing plugins through to flutter_plugin_tools to adjust to flutter/plugin_tools#75. DO NOT MERGE until flutter/plugin_tools#75 has been merged and published. --- script/incremental_build.sh | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/script/incremental_build.sh b/script/incremental_build.sh index 17518cc4cf13..fda90fa54d86 100755 --- a/script/incremental_build.sh +++ b/script/incremental_build.sh @@ -6,10 +6,29 @@ readonly REPO_DIR="$(dirname "$SCRIPT_DIR")" source "$SCRIPT_DIR/common.sh" +# Plugins that deliberately use their own analysis_options.yaml. +# +# This list should only be deleted from, never added to. This only exists +# because we adopted stricter analysis rules recently and needed to exclude +# already failing packages to start linting the repo as a whole. +# +# TODO(mklim): Remove everything from this list. https://github.com/flutter/flutter/issues/45440 +CUSTOM_ANALYSIS_PLUGINS=( + "in_app_purchase" + "camera" + "google_sign_in/google_sign_in" + "google_sign_in/google_sign_in_web" + "google_sign_in/google_sign_in_platform_interface" + "video_player/video_player_platform_interface" +) +# Comma-separated string of the list above +readonly CUSTOM_FLAG=$(IFS=, ; echo "${CUSTOM_ANALYSIS_PLUGINS[*]}") # Set some default actions if run without arguments. ACTIONS=("$@") if [[ "${#ACTIONS[@]}" == 0 ]]; then - ACTIONS=("test" "analyze" "java-test") + ACTIONS=("analyze" "--custom-analysis" "$CUSTOM_FLAG" "test" "java-test") +elif [ "${ACTIONS[@]}" == "analyze" ]; then + ACTIONS=("analyze" "--custom-analysis" "$CUSTOM_FLAG") fi BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}" From ff0c33ddc6caaeb67e533fb9846dc2f0ee3f97c1 Mon Sep 17 00:00:00 2001 From: Michael Klimushyn Date: Thu, 5 Dec 2019 14:15:15 -0800 Subject: [PATCH 2/2] Alphabetize array, remove fixed video_player entry --- script/incremental_build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/incremental_build.sh b/script/incremental_build.sh index fda90fa54d86..34febdf24bfe 100755 --- a/script/incremental_build.sh +++ b/script/incremental_build.sh @@ -17,9 +17,8 @@ CUSTOM_ANALYSIS_PLUGINS=( "in_app_purchase" "camera" "google_sign_in/google_sign_in" - "google_sign_in/google_sign_in_web" "google_sign_in/google_sign_in_platform_interface" - "video_player/video_player_platform_interface" + "google_sign_in/google_sign_in_web" ) # Comma-separated string of the list above readonly CUSTOM_FLAG=$(IFS=, ; echo "${CUSTOM_ANALYSIS_PLUGINS[*]}")