diff options
Diffstat (limited to 'infra/bots/recipes')
63 files changed, 315 insertions, 315 deletions
diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index afd93821a0..2c7b839d00 100644 --- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index c1b62f5624..467ea8e31c 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index ba654dd87f..7dfc1670d9 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index 0d16aece62..de68f05ddf 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 9ef412b20e..bde48f8902 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", "skia", @@ -50,10 +50,10 @@ "src@origin/lkcr" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index d9d85727f0..d51e07dfa3 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json index 54ee674b44..103fc31946 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json index 493981a253..82c0077aa0 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json index c8c74a3244..d0b0124b78 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json index 4e17051f07..829038fa2f 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 9c4f9ae9e7..d00fce5ca2 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json index 7ead220c00..a78179bf22 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json index 43a1a9f4df..5cd5971d81 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index d7767bff89..5db60b8876 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json index 98274dd5bb..9d4c5c001a 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-EMCC-wasm-Release.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-EMCC-wasm-Release.json index 116a436dcc..ff03e488ad 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-EMCC-wasm-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-EMCC-wasm-Release.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json index 64376847b1..47e971be75 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json index 7c5b42fc67..3e992aaef3 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 88978651ae..addfcbfd94 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index a749d0a571..f35662d2c0 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 3da5f622ad..15a847e4b1 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 1d5ca2bfe8..88c252c7be 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index 6c3b3822eb..b326ba095b 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index df5d2274c5..15f1763775 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index 056c8ee9cf..ecf89f0b6a 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", "--patch_root", "src/third_party/skia", @@ -50,10 +50,10 @@ "src/third_party/skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]/flutter", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 223d367f06..c85f8770cd 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index 829dcbdb68..3f684b4e41 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", "--patch_root", "pdfium/third_party/skia", @@ -50,10 +50,10 @@ "pdfium/third_party/skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json index 78da0b7403..c60067d30a 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", "--patch_root", "pdfium/third_party/skia", @@ -50,10 +50,10 @@ "pdfium/third_party/skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json index ce4d444218..d5ed92bde1 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index cf198a4c90..df494a5ca3 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index 5ff63e335e..6d4c527468 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 978cc15b8b..1dc446689b 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json index 52f6b08430..f0e7839639 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json index 118dddb2ed..09b7dc4f0c 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json index a7a9234f74..5c898aa285 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 770b34a2ed..97b6f9d5cf 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 8ae7213090..97e4f2a5d8 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'other_repo', 'url': 'https://skia.googlesource.com/other_repo.git'}]", "--patch_root", "other_repo", @@ -48,10 +48,10 @@ "other_repo@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index 9c4c4d0616..958f934086 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", "--patch_root", "src/third_party/skia", @@ -54,10 +54,10 @@ "src/third_party/skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]/flutter", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json index c9ed8f6134..585e93421e 100644 --- a/infra/bots/recipes/compile.expected/pdfium_trybot.json +++ b/infra/bots/recipes/compile.expected/pdfium_trybot.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", "--patch_root", "pdfium/third_party/skia", @@ -54,10 +54,10 @@ "pdfium/third_party/skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index a3f9b2b15a..651c1d5639 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -52,10 +52,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index dd4a2833a3..b0f7c0b470 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json index 5613cb661e..2bef9308d1 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json index 09b4f63cfb..9726bf45a0 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 67e6ceb536..1b5f1c36ef 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -52,10 +52,10 @@ "skia@origin/master" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index d1ccac223c..d9e6c0701f 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index 79bc36443c..872a058a57 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index ede3229bd2..15b059fad7 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 7d239ca5a6..4a637ec97d 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index f7f67e4581..39b4820cd9 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index c77d742a75..ff86054bf4 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index c945d315db..13ad9bd799 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index c14f2c829d..ba63a3e8eb 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -52,10 +52,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 92568300e8..68846f9b5b 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -52,10 +52,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index 64dae08ff0..c07ad6f539 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/infra.expected/failed_all_updates.json b/infra/bots/recipes/infra.expected/failed_all_updates.json index 7e1dc3e504..2f47b34d51 100644 --- a/infra/bots/recipes/infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/infra.expected/failed_all_updates.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/infra.expected/failed_one_update.json b/infra/bots/recipes/infra.expected/failed_one_update.json index b13d2f7c84..45c0e740d1 100644 --- a/infra/bots/recipes/infra.expected/failed_one_update.json +++ b/infra/bots/recipes/infra.expected/failed_one_update.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/infra.expected/infra_tests.json b/infra/bots/recipes/infra.expected/infra_tests.json index 9221052892..79fb6dc3f6 100644 --- a/infra/bots/recipes/infra.expected/infra_tests.json +++ b/infra/bots/recipes/infra.expected/infra_tests.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index 45d0676ce9..c6bc57bfef 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", "skia", @@ -50,10 +50,10 @@ "src@origin/lkcr" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index 6d108fe28a..9e3fc7a9e7 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", "skia", @@ -50,10 +50,10 @@ "src@origin/lkcr" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 3404164f6a..7aa7275fbf 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", "skia", @@ -50,10 +50,10 @@ "src@origin/lkcr" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json b/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json index a8fe69b1c6..8f3d749c90 100644 --- a/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json +++ b/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/update_meta_config.expected/failed_update.json b/infra/bots/recipes/update_meta_config.expected/failed_update.json index 09458952a1..87b164653e 100644 --- a/infra/bots/recipes/update_meta_config.expected/failed_update.json +++ b/infra/bots/recipes/update_meta_config.expected/failed_update.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -48,10 +48,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", diff --git a/infra/bots/recipes/update_meta_config.expected/trybot_test.json b/infra/bots/recipes/update_meta_config.expected/trybot_test.json index 16bcf062f1..b64a921587 100644 --- a/infra/bots/recipes/update_meta_config.expected/trybot_test.json +++ b/infra/bots/recipes/update_meta_config.expected/trybot_test.json @@ -32,7 +32,7 @@ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", - "--spec", + "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", @@ -52,10 +52,10 @@ "skia@abc123" ], "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" + "env_prefixes": { + "PATH": [ + "RECIPE_PACKAGE_REPO[depot_tools]" + ] }, "infra_step": true, "name": "bot_update", |