Run clang analyzer linter on iOS embedder Remove the Linux host_debug linter, which takes 20+ minutes to `--lint-all` Mac Unopt runs "test: lint ios_debug_sim" (+3:46): https://ci.chromium.org/raw/build/logs.chromium.org/flutter/led/magder_google.com/8ee83f0cd0adc5d2c08cb6f90b7e5b57805244ba325b436c7c68ee64e53847f3/+/build.proto?server=chromium-swarm.appspot.com Bug: https://github.com/flutter/flutter/issues/61661 Change-Id: If47ebbec0d8a686e1bcf3989ba9809ddc55b5681 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/20260 Reviewed-by: Zach Anderson <zra@google.com> Reviewed-by: Godofredo Contreras <godofredoc@google.com> Commit-Queue: Jenn Magder <magder@google.com>
diff --git a/recipes/engine_unopt.expected/linux.json b/recipes/engine_unopt.expected/linux.json index a171c50..a975b37 100644 --- a/recipes/engine_unopt.expected/linux.json +++ b/recipes/engine_unopt.expected/linux.json
@@ -477,45 +477,6 @@ }, { "cmd": [ - "[CACHE]/builder/src/flutter/ci/lint.sh" - ], - "cwd": "[CACHE]/builder/src", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_PREBUILT_DART_SDK": "True", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "luci_context": { - "realm": { - "name": "flutter:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "test: lint test" - }, - { - "cmd": [ "[CACHE]/builder/src/flutter/ci/licenses.sh" ], "cwd": "[CACHE]/builder/src",
diff --git a/recipes/engine_unopt.expected/linux_lto.json b/recipes/engine_unopt.expected/linux_lto.json index 1c2ed78..c207949 100644 --- a/recipes/engine_unopt.expected/linux_lto.json +++ b/recipes/engine_unopt.expected/linux_lto.json
@@ -477,45 +477,6 @@ }, { "cmd": [ - "[CACHE]/builder/src/flutter/ci/lint.sh" - ], - "cwd": "[CACHE]/builder/src", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_PREBUILT_DART_SDK": "True", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "luci_context": { - "realm": { - "name": "flutter:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "test: lint test" - }, - { - "cmd": [ "[CACHE]/builder/src/flutter/ci/licenses.sh" ], "cwd": "[CACHE]/builder/src",
diff --git a/recipes/engine_unopt.expected/mac.json b/recipes/engine_unopt.expected/mac.json index ab4e178..d457096 100644 --- a/recipes/engine_unopt.expected/mac.json +++ b/recipes/engine_unopt.expected/mac.json
@@ -1585,6 +1585,50 @@ "name": "gn --ios --runtime-mode debug --simulator --no-lto" }, { + "cmd": [ + "[CACHE]/builder/src/flutter/ci/lint.sh", + "--lint-all", + "--variant", + "ios_debug_sim" + ], + "cwd": "[CACHE]/builder/src", + "env": { + "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", + "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", + "FLUTTER_PREBUILT_DART_SDK": "True", + "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", + "GEM_HOME": "[START_DIR]/gems", + "GOMA_DIR": "[CACHE]/goma/client" + }, + "env_prefixes": { + "PATH": [ + "[START_DIR]/gems/bin", + "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" + ] + }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, + "luci_context": { + "realm": { + "name": "flutter:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, + "name": "test: lint ios_debug_sim" + }, + { "cmd": [], "name": "setup goma (2)" },
diff --git a/recipes/engine_unopt.expected/mac_lto.json b/recipes/engine_unopt.expected/mac_lto.json index ab4e178..d457096 100644 --- a/recipes/engine_unopt.expected/mac_lto.json +++ b/recipes/engine_unopt.expected/mac_lto.json
@@ -1585,6 +1585,50 @@ "name": "gn --ios --runtime-mode debug --simulator --no-lto" }, { + "cmd": [ + "[CACHE]/builder/src/flutter/ci/lint.sh", + "--lint-all", + "--variant", + "ios_debug_sim" + ], + "cwd": "[CACHE]/builder/src", + "env": { + "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", + "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", + "FLUTTER_PREBUILT_DART_SDK": "True", + "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", + "GEM_HOME": "[START_DIR]/gems", + "GOMA_DIR": "[CACHE]/goma/client" + }, + "env_prefixes": { + "PATH": [ + "[START_DIR]/gems/bin", + "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" + ] + }, + "env_suffixes": { + "DEPOT_TOOLS_UPDATE": [ + "0" + ], + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, + "luci_context": { + "realm": { + "name": "flutter:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, + "name": "test: lint ios_debug_sim" + }, + { "cmd": [], "name": "setup goma (2)" },
diff --git a/recipes/engine_unopt.py b/recipes/engine_unopt.py index 40aa044..b88cabd 100644 --- a/recipes/engine_unopt.py +++ b/recipes/engine_unopt.py
@@ -93,11 +93,11 @@ ) -def Lint(api): +def Lint(api, config): checkout = GetCheckoutPath(api) with api.context(cwd=checkout): lint_cmd = checkout.join('flutter', 'ci', 'lint.sh') - api.step(api.test_utils.test_step_name('lint test'), [lint_cmd]) + api.step(api.test_utils.test_step_name('lint %s' % config), [lint_cmd, '--lint-all', '--variant', config]) def LintAndroidHost(api): @@ -183,6 +183,7 @@ # Simulator doesn't use bitcode. # Simulator binary is needed in all runtime modes. RunGN(api, '--ios', '--runtime-mode', 'debug', '--simulator', '--no-lto') + Lint(api, 'ios_debug_sim') Build(api, 'ios_debug_sim') Build(api, 'ios_debug_sim', 'ios_test_flutter') @@ -261,7 +262,6 @@ # Checks before building the engine. Only run on Linux. if api.platform.is_linux: FormatAndDartTest(api) - Lint(api) CheckLicenses(api) BuildLinux(api) AnalyzeDartUI(api)