Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/skia.expected/download_and_push_skimage.json

Issue 1930433002: Roll recipe dependencies (nontrivial). (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/skia/skia.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json ('k') | scripts/slave/recipes/skia/skia.expected/download_and_push_skps.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/skia.expected/download_and_push_skimage.json
diff --git a/scripts/slave/recipes/skia/skia.expected/download_and_push_skimage.json b/scripts/slave/recipes/skia/skia.expected/download_and_push_skimage.json
index 9f99b8565c0603d0e6e8c8df915d46c1cee806cf..0d1c77d0af0b6a2e33bea47004527d8dd8ff589f 100644
--- a/scripts/slave/recipes/skia/skia.expected/download_and_push_skimage.json
+++ b/scripts/slave/recipes/skia/skia.expected/download_and_push_skimage.json
@@ -47,7 +47,6 @@
"--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -68,7 +67,6 @@
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -138,7 +136,6 @@
"-u",
"import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccache = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\nprint json.dumps({'ccache': ccache})\n"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -208,7 +205,6 @@
"-s",
"015d210a13480604"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -225,7 +221,6 @@
"-s",
"015d210a13480604"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -245,7 +240,6 @@
"echo",
"$EXTERNAL_STORAGE"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -261,7 +255,6 @@
"015d210a13480604",
"root"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -274,7 +267,6 @@
"sleep",
"10"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -288,7 +280,6 @@
"-s",
"015d210a13480604"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -305,7 +296,6 @@
"-s",
"015d210a13480604"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -323,7 +313,6 @@
"-s",
"015d210a13480604"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -342,7 +331,6 @@
"shell",
"stop"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -359,7 +347,6 @@
"dumpsys",
"batteryproperties"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -376,7 +363,6 @@
"[SLAVE_BUILD]/skia/resources",
"/storage/emulated/legacy/skiabot/skia_resources"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -395,7 +381,6 @@
"[SLAVE_BUILD]/tmp",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -418,7 +403,6 @@
"[SLAVE_BUILD]/tmp/SKP_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SKP_VERSION"
},
{
@@ -429,7 +413,6 @@
"[SLAVE_BUILD]/skia/SKP_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get expected SKP_VERSION"
},
{
@@ -441,7 +424,6 @@
"cat",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -458,7 +440,6 @@
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SK_IMAGE_VERSION"
},
{
@@ -469,7 +450,6 @@
"[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get expected SK_IMAGE_VERSION"
},
{
@@ -479,7 +459,6 @@
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION"
],
- "cwd": "[SLAVE_BUILD]",
"name": "remove actual SK_IMAGE_VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -496,7 +475,6 @@
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[SLAVE_BUILD]/images"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree images",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -517,7 +495,6 @@
"[SLAVE_BUILD]/images",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs images",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -545,7 +522,6 @@
"gs://chromium-skia-gm/skimage/v42/*",
"[SLAVE_BUILD]/images"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
"BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
@@ -560,7 +536,6 @@
"42",
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION"
],
- "cwd": "[SLAVE_BUILD]",
"name": "write SK_IMAGE_VERSION"
},
{
@@ -572,7 +547,6 @@
"cat",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -591,7 +565,6 @@
"-f",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -609,7 +582,6 @@
"-r",
"/storage/emulated/legacy/skiabot/skia_images"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -633,7 +605,6 @@
"FILE_EXISTS;",
"fi"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -652,7 +623,6 @@
"-p",
"/storage/emulated/legacy/skiabot/skia_images"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -669,7 +639,6 @@
"[SLAVE_BUILD]/images",
"/storage/emulated/legacy/skiabot/skia_images"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -689,7 +658,6 @@
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -704,7 +672,6 @@
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[SLAVE_BUILD]/dm"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -725,7 +692,6 @@
"[SLAVE_BUILD]/dm",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -750,7 +716,6 @@
"-r",
"/storage/emulated/legacy/skiabot/skia_dm"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -774,7 +739,6 @@
"FILE_EXISTS;",
"fi"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -793,7 +757,6 @@
"-p",
"/storage/emulated/legacy/skiabot/skia_dm"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -858,7 +821,6 @@
"[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -917,7 +879,6 @@
"--nocpu",
"--dummy-flags"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -937,7 +898,6 @@
"/storage/emulated/legacy/skiabot/skia_dm",
"[SLAVE_BUILD]/dm"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -992,7 +952,6 @@
"--nocpu",
"--dummy-flags"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -1012,7 +971,6 @@
"dumpsys",
"batteryproperties"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -1027,7 +985,6 @@
"015d210a13480604",
"reboot"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -1040,7 +997,6 @@
"sleep",
"10"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -1054,7 +1010,6 @@
"-s",
"015d210a13480604"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
@@ -1071,7 +1026,6 @@
"-s",
"015d210a13480604"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
"ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
« no previous file with comments | « scripts/slave/recipes/skia/skia.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json ('k') | scripts/slave/recipes/skia/skia.expected/download_and_push_skps.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698