Revert "Started sharding lints across [mac,ios] and [linux,android]."
This reverts commit e3212aeaad588d070e9194aa61ab02467ff8dba6.
Reason for revert: Tree broken with invalid shard id: 1
Original change's description:
> Started sharding lints across [mac,ios] and [linux,android].
>
> Related: https://github.com/flutter/engine/pull/37265
> Change-Id: Ie42e5d56ee7441ca6c2d2b5b5b299d7b89c1d876
> Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/35760
> Commit-Queue: Aaron Clarke <aaclarke@google.com>
> Reviewed-by: Keyong Han <keyonghan@google.com>
TBR=zra@google.com,keyonghan@google.com,chillers@google.com,flutter-scoped@luci-project-accounts.iam.gserviceaccount.com,aaclarke@google.com
Change-Id: I360cb62502cc753145f93e2b1798749ca70b758d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/35742
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Casey Hillers <chillers@google.com>
Reviewed-by: Casey Hillers <chillers@google.com>
diff --git a/recipes/engine/engine_lint.expected/linux android all.json b/recipes/engine/engine_lint.expected/linux android all.json
index f9ee84a..38d42f9 100644
--- a/recipes/engine/engine_lint.expected/linux android all.json
+++ b/recipes/engine/engine_lint.expected/linux android all.json
@@ -578,51 +578,6 @@
"name": "gn --android --android-cpu arm64 --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1475,9 +1430,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"android_debug_arm64",
- "--lint-all",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1515,6 +1468,51 @@
"name": "test: lint android_debug_arm64"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -1965,9 +1963,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"host_debug",
- "--lint-all",
- "--shard-id=1",
- "--shard-variants=android_debug_arm64"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/linux android branch.json b/recipes/engine/engine_lint.expected/linux android branch.json
index f9ee84a..38d42f9 100644
--- a/recipes/engine/engine_lint.expected/linux android branch.json
+++ b/recipes/engine/engine_lint.expected/linux android branch.json
@@ -578,51 +578,6 @@
"name": "gn --android --android-cpu arm64 --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1475,9 +1430,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"android_debug_arm64",
- "--lint-all",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1515,6 +1468,51 @@
"name": "test: lint android_debug_arm64"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -1965,9 +1963,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"host_debug",
- "--lint-all",
- "--shard-id=1",
- "--shard-variants=android_debug_arm64"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/linux android head.json b/recipes/engine/engine_lint.expected/linux android head.json
index c2211be..585b060 100644
--- a/recipes/engine/engine_lint.expected/linux android head.json
+++ b/recipes/engine/engine_lint.expected/linux android head.json
@@ -578,51 +578,6 @@
"name": "gn --android --android-cpu arm64 --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1476,9 +1431,7 @@
"--variant",
"android_debug_arm64",
"--lint-all",
- "--lint-head",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-head"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1516,6 +1469,51 @@
"name": "test: lint android_debug_arm64"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -1967,9 +1965,7 @@
"--variant",
"host_debug",
"--lint-all",
- "--lint-head",
- "--shard-id=1",
- "--shard-variants=android_debug_arm64"
+ "--lint-head"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/linux host all.json b/recipes/engine/engine_lint.expected/linux host all.json
index f9ee84a..38d42f9 100644
--- a/recipes/engine/engine_lint.expected/linux host all.json
+++ b/recipes/engine/engine_lint.expected/linux host all.json
@@ -578,51 +578,6 @@
"name": "gn --android --android-cpu arm64 --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1475,9 +1430,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"android_debug_arm64",
- "--lint-all",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1515,6 +1468,51 @@
"name": "test: lint android_debug_arm64"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -1965,9 +1963,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"host_debug",
- "--lint-all",
- "--shard-id=1",
- "--shard-variants=android_debug_arm64"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/linux host branch.json b/recipes/engine/engine_lint.expected/linux host branch.json
index f9ee84a..38d42f9 100644
--- a/recipes/engine/engine_lint.expected/linux host branch.json
+++ b/recipes/engine/engine_lint.expected/linux host branch.json
@@ -578,51 +578,6 @@
"name": "gn --android --android-cpu arm64 --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1475,9 +1430,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"android_debug_arm64",
- "--lint-all",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1515,6 +1468,51 @@
"name": "test: lint android_debug_arm64"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -1965,9 +1963,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"host_debug",
- "--lint-all",
- "--shard-id=1",
- "--shard-variants=android_debug_arm64"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/linux host head.json b/recipes/engine/engine_lint.expected/linux host head.json
index c2211be..585b060 100644
--- a/recipes/engine/engine_lint.expected/linux host head.json
+++ b/recipes/engine/engine_lint.expected/linux host head.json
@@ -578,51 +578,6 @@
"name": "gn --android --android-cpu arm64 --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1476,9 +1431,7 @@
"--variant",
"android_debug_arm64",
"--lint-all",
- "--lint-head",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-head"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1516,6 +1469,51 @@
"name": "test: lint android_debug_arm64"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -1967,9 +1965,7 @@
"--variant",
"host_debug",
"--lint-all",
- "--lint-head",
- "--shard-id=1",
- "--shard-variants=android_debug_arm64"
+ "--lint-head"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac host all.json b/recipes/engine/engine_lint.expected/mac host all.json
index eaa0466..a772c96 100644
--- a/recipes/engine/engine_lint.expected/mac host all.json
+++ b/recipes/engine/engine_lint.expected/mac host all.json
@@ -878,51 +878,6 @@
"name": "gn --ios --runtime-mode debug --simulator --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1775,9 +1730,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"ios_debug_sim",
- "--lint-all",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1815,6 +1768,51 @@
"name": "test: lint ios_debug_sim"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -2265,9 +2263,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"host_debug",
- "--lint-all",
- "--shard-id=1",
- "--shard-variants=ios_debug_sim"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac host branch.json b/recipes/engine/engine_lint.expected/mac host branch.json
index eaa0466..a772c96 100644
--- a/recipes/engine/engine_lint.expected/mac host branch.json
+++ b/recipes/engine/engine_lint.expected/mac host branch.json
@@ -878,51 +878,6 @@
"name": "gn --ios --runtime-mode debug --simulator --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1775,9 +1730,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"ios_debug_sim",
- "--lint-all",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1815,6 +1768,51 @@
"name": "test: lint ios_debug_sim"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -2265,9 +2263,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"host_debug",
- "--lint-all",
- "--shard-id=1",
- "--shard-variants=ios_debug_sim"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac host head.json b/recipes/engine/engine_lint.expected/mac host head.json
index fe98180..f178e46 100644
--- a/recipes/engine/engine_lint.expected/mac host head.json
+++ b/recipes/engine/engine_lint.expected/mac host head.json
@@ -878,51 +878,6 @@
"name": "gn --ios --runtime-mode debug --simulator --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1776,9 +1731,7 @@
"--variant",
"ios_debug_sim",
"--lint-all",
- "--lint-head",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-head"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1816,6 +1769,51 @@
"name": "test: lint ios_debug_sim"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -2267,9 +2265,7 @@
"--variant",
"host_debug",
"--lint-all",
- "--lint-head",
- "--shard-id=1",
- "--shard-variants=ios_debug_sim"
+ "--lint-head"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios all.json b/recipes/engine/engine_lint.expected/mac ios all.json
index eaa0466..a772c96 100644
--- a/recipes/engine/engine_lint.expected/mac ios all.json
+++ b/recipes/engine/engine_lint.expected/mac ios all.json
@@ -878,51 +878,6 @@
"name": "gn --ios --runtime-mode debug --simulator --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1775,9 +1730,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"ios_debug_sim",
- "--lint-all",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1815,6 +1768,51 @@
"name": "test: lint ios_debug_sim"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -2265,9 +2263,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"host_debug",
- "--lint-all",
- "--shard-id=1",
- "--shard-variants=ios_debug_sim"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios branch.json b/recipes/engine/engine_lint.expected/mac ios branch.json
index eaa0466..a772c96 100644
--- a/recipes/engine/engine_lint.expected/mac ios branch.json
+++ b/recipes/engine/engine_lint.expected/mac ios branch.json
@@ -878,51 +878,6 @@
"name": "gn --ios --runtime-mode debug --simulator --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1775,9 +1730,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"ios_debug_sim",
- "--lint-all",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1815,6 +1768,51 @@
"name": "test: lint ios_debug_sim"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -2265,9 +2263,7 @@
"[CACHE]/builder/src/flutter/ci/lint.sh",
"--variant",
"host_debug",
- "--lint-all",
- "--shard-id=1",
- "--shard-variants=ios_debug_sim"
+ "--lint-all"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios head.json b/recipes/engine/engine_lint.expected/mac ios head.json
index fe98180..f178e46 100644
--- a/recipes/engine/engine_lint.expected/mac ios head.json
+++ b/recipes/engine/engine_lint.expected/mac ios head.json
@@ -878,51 +878,6 @@
"name": "gn --ios --runtime-mode debug --simulator --no-lto"
},
{
- "cmd": [
- "python",
- "[CACHE]/builder/src/flutter/tools/gn",
- "--goma",
- "--runtime-mode",
- "debug",
- "--prebuilt-dart-sdk",
- "--no-lto"
- ],
- "cwd": "[CACHE]/builder",
- "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
- },
- {
"cmd": [],
"name": "setup goma"
},
@@ -1776,9 +1731,7 @@
"--variant",
"ios_debug_sim",
"--lint-all",
- "--lint-head",
- "--shard-id=0",
- "--shard-variants=host_debug"
+ "--lint-head"
],
"cwd": "[CACHE]/builder/src",
"env": {
@@ -1816,6 +1769,51 @@
"name": "test: lint ios_debug_sim"
},
{
+ "cmd": [
+ "python",
+ "[CACHE]/builder/src/flutter/tools/gn",
+ "--goma",
+ "--runtime-mode",
+ "debug",
+ "--prebuilt-dart-sdk",
+ "--no-lto"
+ ],
+ "cwd": "[CACHE]/builder",
+ "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": "gn --runtime-mode debug --prebuilt-dart-sdk --no-lto"
+ },
+ {
"cmd": [],
"name": "setup goma (2)"
},
@@ -2267,9 +2265,7 @@
"--variant",
"host_debug",
"--lint-all",
- "--lint-head",
- "--shard-id=1",
- "--shard-variants=ios_debug_sim"
+ "--lint-head"
],
"cwd": "[CACHE]/builder/src",
"env": {
diff --git a/recipes/engine/engine_lint.py b/recipes/engine/engine_lint.py
index 7ff8053..166544d 100644
--- a/recipes/engine/engine_lint.py
+++ b/recipes/engine/engine_lint.py
@@ -49,7 +49,7 @@
api.build_util.build(config, checkout, targets)
-def Lint(api, config, shardId=None, shardVariants=""):
+def Lint(api, config):
checkout = GetCheckoutPath(api)
with api.context(cwd=checkout):
lint_cmd = checkout.join('flutter', 'ci', 'lint.sh')
@@ -58,40 +58,38 @@
cmd += ['--lint-all']
if api.properties.get('lint_head', False):
cmd += ['--lint-head']
- if shardId != None:
- cmd += ['--shard-id=%d' % shardId, '--shard-variants=%s' % shardVariants]
api.step(api.test_utils.test_step_name('lint %s' % config), cmd)
def DoLints(api):
if api.platform.is_linux:
- RunGN(api, '--android', '--android-cpu', 'arm64', '--no-lto')
- RunGN(api, '--runtime-mode', 'debug', '--prebuilt-dart-sdk', '--no-lto')
if api.properties.get('lint_android', True):
+ RunGN(api, '--android', '--android-cpu', 'arm64', '--no-lto')
Build(api, 'android_debug_arm64')
- Lint(api, 'android_debug_arm64', shardId=0, shardVariants="host_debug")
+ Lint(api, 'android_debug_arm64')
if api.properties.get('lint_host', True):
+ RunGN(api, '--runtime-mode', 'debug', '--prebuilt-dart-sdk', '--no-lto')
# We have to build before linting because source files #include header
# files that are generated during the build.
Build(api, 'host_debug')
- Lint(api, 'host_debug', shardId=1, shardVariants="android_debug_arm64")
+ Lint(api, 'host_debug')
elif api.platform.is_mac:
with api.osx_sdk('ios'):
- RunGN(
- api, '--ios', '--runtime-mode', 'debug', '--simulator', '--no-lto',
- )
- RunGN(api, '--runtime-mode', 'debug', '--prebuilt-dart-sdk', '--no-lto')
if api.properties.get('lint_ios', True):
+ RunGN(
+ api, '--ios', '--runtime-mode', 'debug', '--simulator', '--no-lto',
+ )
Build(api, 'ios_debug_sim')
- Lint(api, 'ios_debug_sim', shardId=0, shardVariants="host_debug")
+ Lint(api, 'ios_debug_sim')
if api.properties.get('lint_host', True):
+ RunGN(api, '--runtime-mode', 'debug', '--prebuilt-dart-sdk', '--no-lto')
# We have to build before linting because source files #include header
# files that are generated during the build.
Build(api, 'host_debug')
- Lint(api, 'host_debug', shardId=1, shardVariants="ios_debug_sim")
+ Lint(api, 'host_debug')
def RunSteps(api, properties, env_properties):
