Checkout the source code in the cache folder.
This is to reuse checkouts of the source code avoiding full checkouts on
every task.
Change-Id: I5aa3df718d811ab3dd59fcb7df03eedcd9b558a1
Bug: https://github.com/flutter/flutter/issues/72740
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/9482
Reviewed-by: Keyong Han <keyonghan@google.com>
Reviewed-by: Casey Hillers <chillers@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipes/devicelab/devicelab_drone.expected/basic.json b/recipes/devicelab/devicelab_drone.expected/basic.json
index 7718479..04a5b5d 100644
--- a/recipes/devicelab/devicelab_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_drone.expected/basic.json
@@ -20,7 +20,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[START_DIR]/flutter",
+ "[CACHE]/flutter sdk",
"--url",
"https://chromium.googlesource.com/external/github.com/flutter/flutter"
],
@@ -39,7 +39,7 @@
"--progress",
"--tags"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"env": {
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
@@ -56,7 +56,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.git checkout",
"~followup_annotations": [
@@ -69,7 +69,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.read revision",
"~followup_annotations": [
@@ -86,7 +86,7 @@
"-d",
"-x"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.git clean",
"~followup_annotations": [
@@ -99,7 +99,7 @@
"submodule",
"sync"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.submodule sync",
"~followup_annotations": [
@@ -114,7 +114,7 @@
"--init",
"--recursive"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.submodule update",
"~followup_annotations": [
@@ -127,7 +127,7 @@
"doctor",
"--verbose"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -135,12 +135,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "flutter doctor"
@@ -150,7 +150,7 @@
"flutter",
"update-packages"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -158,12 +158,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "flutter update-packages"
@@ -173,7 +173,7 @@
"pub",
"get"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -181,12 +181,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "pub get"
@@ -198,7 +198,7 @@
"-t",
"abc"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -206,14 +206,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "run abc"
@@ -227,7 +227,7 @@
"pkill",
"chrome"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -235,14 +235,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill chrome",
@@ -255,7 +255,7 @@
"pkill",
"dart"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -263,14 +263,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill dart",
@@ -283,7 +283,7 @@
"pkill",
"flutter"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -291,14 +291,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill flutter",
@@ -311,7 +311,7 @@
"pkill",
"java"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -319,14 +319,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill java",
@@ -339,7 +339,7 @@
"pkill",
"adb"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -347,14 +347,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill adb",
@@ -371,7 +371,7 @@
"-o",
"%MEM"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -379,14 +379,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "OS info (2)"
diff --git a/recipes/devicelab/devicelab_drone.expected/post-submit.json b/recipes/devicelab/devicelab_drone.expected/post-submit.json
index 585f8f8..a5712fb 100644
--- a/recipes/devicelab/devicelab_drone.expected/post-submit.json
+++ b/recipes/devicelab/devicelab_drone.expected/post-submit.json
@@ -20,7 +20,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[START_DIR]/flutter",
+ "[CACHE]/flutter sdk",
"--url",
"https://chromium.googlesource.com/external/github.com/flutter/flutter"
],
@@ -39,7 +39,7 @@
"--progress",
"--tags"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"env": {
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
@@ -56,7 +56,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.git checkout",
"~followup_annotations": [
@@ -69,7 +69,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.read revision",
"~followup_annotations": [
@@ -86,7 +86,7 @@
"-d",
"-x"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.git clean",
"~followup_annotations": [
@@ -99,7 +99,7 @@
"submodule",
"sync"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.submodule sync",
"~followup_annotations": [
@@ -114,7 +114,7 @@
"--init",
"--recursive"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.submodule update",
"~followup_annotations": [
@@ -151,7 +151,7 @@
"doctor",
"--verbose"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -159,12 +159,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "flutter doctor"
@@ -174,7 +174,7 @@
"flutter",
"update-packages"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -182,12 +182,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "flutter update-packages"
@@ -197,7 +197,7 @@
"pub",
"get"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -205,12 +205,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "pub get"
@@ -228,7 +228,7 @@
"--git-branch",
""
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -236,14 +236,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "run abc"
@@ -257,7 +257,7 @@
"pkill",
"chrome"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -265,14 +265,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill chrome",
@@ -285,7 +285,7 @@
"pkill",
"dart"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -293,14 +293,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill dart",
@@ -313,7 +313,7 @@
"pkill",
"flutter"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -321,14 +321,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill flutter",
@@ -341,7 +341,7 @@
"pkill",
"java"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -349,14 +349,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill java",
@@ -369,7 +369,7 @@
"pkill",
"adb"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -377,14 +377,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill adb",
@@ -401,7 +401,7 @@
"-o",
"%MEM"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -409,14 +409,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "OS info (2)"
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index e6c93bc..f9ab587 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -20,7 +20,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[START_DIR]/flutter",
+ "[CACHE]/flutter sdk",
"--url",
"https://chromium.googlesource.com/external/github.com/flutter/flutter"
],
@@ -39,7 +39,7 @@
"--progress",
"--tags"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"env": {
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
@@ -56,7 +56,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.git checkout",
"~followup_annotations": [
@@ -69,7 +69,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.read revision",
"~followup_annotations": [
@@ -86,7 +86,7 @@
"-d",
"-x"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.git clean",
"~followup_annotations": [
@@ -99,7 +99,7 @@
"submodule",
"sync"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.submodule sync",
"~followup_annotations": [
@@ -114,7 +114,7 @@
"--init",
"--recursive"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.submodule update",
"~followup_annotations": [
@@ -127,7 +127,7 @@
"doctor",
"--verbose"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -135,12 +135,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "flutter doctor"
@@ -150,7 +150,7 @@
"flutter",
"update-packages"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -158,12 +158,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "flutter update-packages"
@@ -173,7 +173,7 @@
"pub",
"get"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -181,12 +181,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "pub get"
@@ -197,7 +197,7 @@
"755",
"RECIPE[flutter::devicelab/devicelab_drone].resources/runner.sh"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -205,14 +205,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Set execute permission"
@@ -230,7 +230,7 @@
"pkill",
"chrome"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -238,14 +238,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill chrome",
@@ -258,7 +258,7 @@
"pkill",
"dart"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -266,14 +266,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill dart",
@@ -286,7 +286,7 @@
"pkill",
"flutter"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -294,14 +294,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill flutter",
@@ -314,7 +314,7 @@
"pkill",
"java"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -322,14 +322,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill java",
@@ -342,7 +342,7 @@
"pkill",
"adb"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -350,14 +350,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill adb",
@@ -374,7 +374,7 @@
"-o",
"%MEM"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -382,14 +382,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "OS info (2)"
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index e6c93bc..f9ab587 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -20,7 +20,7 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[START_DIR]/flutter",
+ "[CACHE]/flutter sdk",
"--url",
"https://chromium.googlesource.com/external/github.com/flutter/flutter"
],
@@ -39,7 +39,7 @@
"--progress",
"--tags"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"env": {
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
@@ -56,7 +56,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.git checkout",
"~followup_annotations": [
@@ -69,7 +69,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.read revision",
"~followup_annotations": [
@@ -86,7 +86,7 @@
"-d",
"-x"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.git clean",
"~followup_annotations": [
@@ -99,7 +99,7 @@
"submodule",
"sync"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.submodule sync",
"~followup_annotations": [
@@ -114,7 +114,7 @@
"--init",
"--recursive"
],
- "cwd": "[START_DIR]/flutter",
+ "cwd": "[CACHE]/flutter sdk",
"infra_step": true,
"name": "Checkout flutter/flutter.submodule update",
"~followup_annotations": [
@@ -127,7 +127,7 @@
"doctor",
"--verbose"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -135,12 +135,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "flutter doctor"
@@ -150,7 +150,7 @@
"flutter",
"update-packages"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -158,12 +158,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "flutter update-packages"
@@ -173,7 +173,7 @@
"pub",
"get"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -181,12 +181,12 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "pub get"
@@ -197,7 +197,7 @@
"755",
"RECIPE[flutter::devicelab/devicelab_drone].resources/runner.sh"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -205,14 +205,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Set execute permission"
@@ -230,7 +230,7 @@
"pkill",
"chrome"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -238,14 +238,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill chrome",
@@ -258,7 +258,7 @@
"pkill",
"dart"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -266,14 +266,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill dart",
@@ -286,7 +286,7 @@
"pkill",
"flutter"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -294,14 +294,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill flutter",
@@ -314,7 +314,7 @@
"pkill",
"java"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -322,14 +322,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill java",
@@ -342,7 +342,7 @@
"pkill",
"adb"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -350,14 +350,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "Killing Processes.kill adb",
@@ -374,7 +374,7 @@
"-o",
"%MEM"
],
- "cwd": "[START_DIR]/flutter/dev/devicelab",
+ "cwd": "[CACHE]/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"LUCI_BRANCH": "",
@@ -382,14 +382,14 @@
"LUCI_PR": "",
"OS": "linux",
"PUB_CACHE": "[CACHE]/.pub-cache",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+ "SDK_CHECKOUT_PATH": "[CACHE]/flutter sdk"
},
"env_prefixes": {
"PATH": [
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin",
- "[START_DIR]/flutter/bin",
- "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CACHE]/flutter sdk/bin",
+ "[CACHE]/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "OS info (2)"
diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py
index bc461ed..f54470d 100644
--- a/recipes/devicelab/devicelab_drone.py
+++ b/recipes/devicelab/devicelab_drone.py
@@ -29,7 +29,7 @@
if not task_name:
raise ValueError('A task_name property is required')
- flutter_path = api.path['start_dir'].join('flutter')
+ flutter_path = api.path['cache'].join('flutter sdk')
api.repo_util.checkout(
'flutter',
flutter_path,
