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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/win.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: 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/infra/build_conda_cipd_pkg.expected/mac.json ('k') | scripts/slave/recipes/infra/build_repo_real_try.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 503818b03cc4f464f237ca69c5ac3418efd82177..5b39aded0afe9c24c9c5f2024027701ed4343fd9 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
@@ -7,15 +7,16 @@
"--platform",
"windows-amd64",
"--dest-directory",
- "[CWD]\\cipd",
+ "[SLAVE_BUILD]\\cipd",
"--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@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -26,8 +27,9 @@
"python",
"-u",
"\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",
- "[CWD]\\conda_staging_dir"
+ "[SLAVE_BUILD]\\conda_staging_dir"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree cleaning staging dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -47,21 +49,23 @@
"RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\pycurl.py",
"https://repo.continuum.io/miniconda/Miniconda2-3.18.3-Windows-x86_64.exe",
"--outfile",
- "[TMP]\\conda_tmp_1\\Miniconda2-3.18.3-Windows-x86_64.exe",
+ "[TMP_BASE]\\conda_tmp_1\\Miniconda2-3.18.3-Windows-x86_64.exe",
"--attempts",
"5"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fetch miniconda installer"
},
{
"cmd": [
- "[TMP]\\conda_tmp_1\\Miniconda2-3.18.3-Windows-x86_64.exe",
+ "[TMP_BASE]\\conda_tmp_1\\Miniconda2-3.18.3-Windows-x86_64.exe",
"/InstallationType=JustMe",
"/AddToPath=0",
"/RegisterPython=0",
"/S",
- "/D=[CWD]\\conda_staging_dir"
+ "/D=[SLAVE_BUILD]\\conda_staging_dir"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": ""
},
@@ -72,8 +76,9 @@
"python",
"-u",
"\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]\\conda_tmp_1"
+ "[TMP_BASE]\\conda_tmp_1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree remove miniconda installer",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -88,11 +93,12 @@
},
{
"cmd": [
- "[CWD]\\conda_staging_dir\\Scripts\\conda.exe",
+ "[SLAVE_BUILD]\\conda_staging_dir\\Scripts\\conda.exe",
"install",
"matplotlib",
"--yes"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": null
},
@@ -100,11 +106,12 @@
},
{
"cmd": [
- "[CWD]\\conda_staging_dir\\Scripts\\conda.exe",
+ "[SLAVE_BUILD]\\conda_staging_dir\\Scripts\\conda.exe",
"install",
"numpy",
"--yes"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": null
},
@@ -112,11 +119,12 @@
},
{
"cmd": [
- "[CWD]\\conda_staging_dir\\Scripts\\conda.exe",
+ "[SLAVE_BUILD]\\conda_staging_dir\\Scripts\\conda.exe",
"install",
"scipy",
"--yes"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": null
},
@@ -124,13 +132,14 @@
},
{
"cmd": [
- "[CWD]\\conda_staging_dir\\Scripts\\conda.exe",
+ "[SLAVE_BUILD]\\conda_staging_dir\\Scripts\\conda.exe",
"clean",
"--tarballs",
"--index-cache",
"--packages",
"--yes"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PYTHONPATH": null
},
@@ -141,25 +150,27 @@
"python",
"-u",
"RECIPE_MODULE[build::conda]\\resources\\butcher_conda.py",
- "[CWD]\\conda_staging_dir"
+ "[SLAVE_BUILD]\\conda_staging_dir"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "make conda env location independent"
},
{
"cmd": [
- "fake_slave_build/cipd",
+ "[SLAVE_BUILD]\\cipd\\cipd",
"pkg-build",
"--in",
- "[CWD]\\conda_staging_dir",
+ "[SLAVE_BUILD]\\conda_staging_dir",
"--name",
"infra/conda_python/scientific/windows-amd64",
"--out",
- "[CWD]\\conda_python.cipd",
+ "[SLAVE_BUILD]\\conda_python.cipd",
"--json-output",
"/path/to/tmp/json",
"--install-mode",
"copy"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "build windows-amd64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -173,9 +184,9 @@
},
{
"cmd": [
- "fake_slave_build/cipd",
+ "[SLAVE_BUILD]\\cipd\\cipd",
"pkg-register",
- "[CWD]\\conda_python.cipd",
+ "[SLAVE_BUILD]\\conda_python.cipd",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
@@ -187,6 +198,7 @@
"--tag",
"conda:Miniconda2-3-18-3"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "register infra/conda_python/scientific/windows-amd64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -203,8 +215,9 @@
"python",
"-u",
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
- "[CWD]\\conda_python.cipd"
+ "[SLAVE_BUILD]\\conda_python.cipd"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "remove *.cipd file",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -219,8 +232,9 @@
"python",
"-u",
"\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",
- "[CWD]\\conda_staging_dir"
+ "[SLAVE_BUILD]\\conda_staging_dir"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree removing conda",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
« no previous file with comments | « scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/mac.json ('k') | scripts/slave/recipes/infra/build_repo_real_try.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698