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

Unified Diff: scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/win.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
Index: scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/win.json
diff --git a/scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/win.json b/scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/win.json
index 5b39aded0afe9c24c9c5f2024027701ed4343fd9..bbb4d9ca11771ceb22e604575d40bd17c1185e70 100644
--- a/scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/win.json
+++ b/scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/win.json
@@ -11,7 +11,6 @@
"--json-output",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "install cipd",
"~followup_annotations": [
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
@@ -29,7 +28,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]\\conda_staging_dir"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree cleaning staging dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -53,7 +51,6 @@
"--attempts",
"5"
],
- "cwd": "[SLAVE_BUILD]",
"name": "fetch miniconda installer"
},
{
@@ -65,7 +62,6 @@
"/S",
"/D=[SLAVE_BUILD]\\conda_staging_dir"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": ""
},
@@ -78,7 +74,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",
"[TMP_BASE]\\conda_tmp_1"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree remove miniconda installer",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -98,7 +93,6 @@
"matplotlib",
"--yes"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": null
},
@@ -111,7 +105,6 @@
"numpy",
"--yes"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": null
},
@@ -124,7 +117,6 @@
"scipy",
"--yes"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": null
},
@@ -139,7 +131,6 @@
"--packages",
"--yes"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": null
},
@@ -152,7 +143,6 @@
"RECIPE_MODULE[build::conda]\\resources\\butcher_conda.py",
"[SLAVE_BUILD]\\conda_staging_dir"
],
- "cwd": "[SLAVE_BUILD]",
"name": "make conda env location independent"
},
{
@@ -170,7 +160,6 @@
"--install-mode",
"copy"
],
- "cwd": "[SLAVE_BUILD]",
"name": "build windows-amd64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -198,7 +187,6 @@
"--tag",
"conda:Miniconda2-3-18-3"
],
- "cwd": "[SLAVE_BUILD]",
"name": "register infra/conda_python/scientific/windows-amd64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -217,7 +205,6 @@
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
"[SLAVE_BUILD]\\conda_python.cipd"
],
- "cwd": "[SLAVE_BUILD]",
"name": "remove *.cipd file",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -234,7 +221,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]\\conda_staging_dir"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree removing conda",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698