Use separate dirs for separate CIPD manifests
Use a separate installation directory for each CIPD manifest file.
Required minor tweaks to Python configuration as well. Since this now
processes each manifest individually instead of always processing one it
removes many environment variables in expectation files for users of the
environment module.
Change-Id: Ie2376fc8f66a8e8e698f298b9a23ddf8bdf0859b
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/13202
Commit-Queue: Rob Mohr <mohrr@google.com>
Reviewed-by: Marc-Antoine Ruel <maruel@google.com>
diff --git a/recipe_modules/environment/api.py b/recipe_modules/environment/api.py
index c49377b..bf2686b 100644
--- a/recipe_modules/environment/api.py
+++ b/recipe_modules/environment/api.py
@@ -44,6 +44,7 @@
self._ldpath_prefixes = []
self._env = {}
self._initialized = False
+ self._cipd_installation_dirs = []
def _convert_paths(self, root, pathlist):
results = []
@@ -59,24 +60,30 @@
self._cipd_dir = self.m.path['start_dir'].join('cipd')
self._env['PW_CIPD_INSTALL_DIR'] = self._cipd_dir
- ensure_file = self.m.cipd.EnsureFile()
for json_path in self._convert_paths(checkout_root,
self._cipd_package_files):
- name = self.m.path.splitext(self.m.path.basename(json_path))[0].upper()
- self._env['PW_{}_CIPD_INSTALL_DIR'.format(name)] = self._cipd_dir
+ name = self.m.path.splitext(self.m.path.basename(json_path))[0]
+ install_dir = self._cipd_dir.join(name)
+ self._env['PW_{}_CIPD_INSTALL_DIR'.format(name.upper())] = install_dir
packages = self.m.file.read_json('read {}'.format(json_path), json_path)
+ if not packages:
+ continue
+
+ ensure_file = self.m.cipd.EnsureFile()
for pkg in packages:
# JSON files are read as unicode, need to encode to get str.
ensure_file.add_package(pkg['path'].encode(),
' '.join(x.encode() for x in pkg['tags']))
- self.m.cipd.ensure(self._cipd_dir, ensure_file)
+ self.m.cipd.ensure(install_dir, ensure_file)
- self._path_prefixes.append(self._cipd_dir)
- self._path_prefixes.append(self._cipd_dir.join('bin'))
- self._path_prefixes.append(self._cipd_dir.join('mingw64', 'bin'))
- self._ldpath_prefixes.append(self._cipd_dir)
- self._ldpath_prefixes.append(self._cipd_dir.join('lib'))
+ self._path_prefixes.append(install_dir)
+ self._path_prefixes.append(install_dir.join('bin'))
+ self._path_prefixes.append(install_dir.join('mingw64', 'bin'))
+ self._ldpath_prefixes.append(install_dir)
+ self._ldpath_prefixes.append(install_dir.join('lib'))
+ self._cipd_installation_dirs.append(install_dir)
+
def _find_python_packages(self, roots):
"""Return all folders with setup.py entries.
@@ -116,14 +123,17 @@
# Work around weird bug where venv creation requires the name of the
# executable to be python.exe and not python3.exe on Windows.
if self.m.platform.is_win:
- cipd_python = self._cipd_dir.join('bin', 'python3.exe')
- new_cipd_python = self._cipd_dir.join('bin', 'python.exe')
- self.m.file.copy(
- 'cp python3.exe python.exe',
- cipd_python,
- new_cipd_python,
- )
- cipd_python = new_cipd_python
+ for install_dir in self._cipd_installation_dirs:
+ this_python = install_dir.join('bin', 'python3.exe')
+ if self.m.path.exists(this_python):
+ cipd_python = this_python
+ new_cipd_python = install_dir.join('bin', 'python.exe')
+ self.m.file.copy(
+ 'cp python3.exe python.exe',
+ cipd_python,
+ new_cipd_python,
+ )
+ cipd_python = new_cipd_python
self.m.step('create venv', [cipd_python, '-m', 'venv', venv_dir])
diff --git a/recipe_modules/environment/tests/full.expected/windows.json b/recipe_modules/environment/tests/full.expected/windows.json
index ccfcbcf..aab1075 100644
--- a/recipe_modules/environment/tests/full.expected/windows.json
+++ b/recipe_modules/environment/tests/full.expected/windows.json
@@ -34,7 +34,7 @@
"cipd.bat",
"ensure",
"-root",
- "[START_DIR]\\cipd",
+ "[START_DIR]\\cipd\\cipd_packages",
"-ensure-file",
"cipd\\path\\${platform} version:42",
"-max-threads",
@@ -117,24 +117,24 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]\\cipd\\bin\\python3.exe",
- "[START_DIR]\\cipd\\bin\\python.exe"
+ "[START_DIR]\\cipd\\cipd_packages\\bin\\python3.exe",
+ "[START_DIR]\\cipd\\cipd_packages\\bin\\python.exe"
],
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd\\cipd_packages",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\lib"
],
"PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\bin",
+ "[START_DIR]\\cipd\\cipd_packages\\mingw64\\bin"
]
},
"infra_step": true,
@@ -145,7 +145,7 @@
},
{
"cmd": [
- "[START_DIR]\\cipd\\bin\\python.exe",
+ "[START_DIR]\\cipd\\cipd_packages\\bin\\python.exe",
"-m",
"venv",
"[START_DIR]\\venv"
@@ -153,18 +153,18 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd\\cipd_packages",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\lib"
],
"PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\bin",
+ "[START_DIR]\\cipd\\cipd_packages\\mingw64\\bin"
]
},
"name": "environment.setup python.setup virtualenv.create venv",
@@ -184,18 +184,18 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd\\cipd_packages",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\lib"
],
"PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\bin",
+ "[START_DIR]\\cipd\\cipd_packages\\mingw64\\bin"
]
},
"name": "environment.setup python.setup virtualenv.upgrade pip",
@@ -222,20 +222,20 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd\\cipd_packages",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]\\venv"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\lib"
],
"PATH": [
"[START_DIR]\\venv\\bin",
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\bin",
+ "[START_DIR]\\cipd\\cipd_packages\\mingw64\\bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -255,20 +255,20 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd\\cipd_packages",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]\\venv"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\lib"
],
"PATH": [
"[START_DIR]\\venv\\bin",
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
+ "[START_DIR]\\cipd\\cipd_packages",
+ "[START_DIR]\\cipd\\cipd_packages\\bin",
+ "[START_DIR]\\cipd\\cipd_packages\\mingw64\\bin"
]
},
"name": "environment.setup python.install packages.build requirements",
diff --git a/recipe_modules/environment/tests/full.expected/with_cargo.json b/recipe_modules/environment/tests/full.expected/with_cargo.json
index b42cfe5..ba5ec0f 100644
--- a/recipe_modules/environment/tests/full.expected/with_cargo.json
+++ b/recipe_modules/environment/tests/full.expected/with_cargo.json
@@ -34,7 +34,7 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd",
+ "[START_DIR]/cipd/cipd_packages",
"-ensure-file",
"cipd/path/${platform} version:42",
"-max-threads",
@@ -59,6 +59,25 @@
]
},
{
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[START_DIR]/empty.json",
+ "/path/to/tmp/"
+ ],
+ "infra_step": true,
+ "name": "environment.setup cipd.read [START_DIR]/empty.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_LINE@empty.json@\"\"@@@",
+ "@@@STEP_LOG_END@empty.json@@@"
+ ]
+ },
+ {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -119,18 +138,19 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd/cipd_packages",
+ "PW_EMPTY_CIPD_INSTALL_DIR": "[START_DIR]/cipd/empty",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/lib"
],
"PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/bin",
+ "[START_DIR]/cipd/cipd_packages/mingw64/bin"
]
},
"name": "environment.setup python.setup virtualenv.create venv",
@@ -150,18 +170,19 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd/cipd_packages",
+ "PW_EMPTY_CIPD_INSTALL_DIR": "[START_DIR]/cipd/empty",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/lib"
],
"PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/bin",
+ "[START_DIR]/cipd/cipd_packages/mingw64/bin"
]
},
"name": "environment.setup python.setup virtualenv.upgrade pip",
@@ -188,20 +209,21 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd/cipd_packages",
+ "PW_EMPTY_CIPD_INSTALL_DIR": "[START_DIR]/cipd/empty",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/lib"
],
"PATH": [
"[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/bin",
+ "[START_DIR]/cipd/cipd_packages/mingw64/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -221,20 +243,21 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd/cipd_packages",
+ "PW_EMPTY_CIPD_INSTALL_DIR": "[START_DIR]/cipd/empty",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/lib"
],
"PATH": [
"[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/bin",
+ "[START_DIR]/cipd/cipd_packages/mingw64/bin"
]
},
"name": "environment.setup python.install packages.build requirements",
@@ -287,20 +310,21 @@
"FOO_ROOT": "[START_DIR]",
"PW_CARGO_SETUP": "1",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd/cipd_packages",
+ "PW_EMPTY_CIPD_INSTALL_DIR": "[START_DIR]/cipd/empty",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
"LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/lib"
],
"PATH": [
"[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin",
+ "[START_DIR]/cipd/cipd_packages",
+ "[START_DIR]/cipd/cipd_packages/bin",
+ "[START_DIR]/cipd/cipd_packages/mingw64/bin",
"[START_DIR]/cargo/bin"
]
},
diff --git a/recipe_modules/environment/tests/full.py b/recipe_modules/environment/tests/full.py
index c38233e..0859777 100644
--- a/recipe_modules/environment/tests/full.py
+++ b/recipe_modules/environment/tests/full.py
@@ -40,10 +40,11 @@
def GenTests(api): # pylint: disable=invalid-name
+ props = api.environment.properties(minimal=False, with_cargo=True)
+ props['$pigweed/environment']['cipd_package_files'].append('empty.json')
yield (
api.status_check.test('with_cargo')
- + api.properties(
- **api.environment.properties(minimal=False, with_cargo=True))
+ + api.properties(**props)
+ api.environment.test_data(with_cargo=True)
) # yapf: disable
@@ -52,4 +53,6 @@
+ api.properties(**api.environment.properties(minimal=False))
+ api.environment.test_data(windows=True)
+ api.platform.name('win')
+ + api.path.exists(api.path['start_dir'].join('cipd', 'cipd_packages',
+ 'bin', 'python3.exe'))
) # yapf: disable
diff --git a/recipes/docs_builder.expected/docs.json b/recipes/docs_builder.expected/docs.json
index e82669c..fce7fb4 100644
--- a/recipes/docs_builder.expected/docs.json
+++ b/recipes/docs_builder.expected/docs.json
@@ -349,28 +349,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -410,17 +388,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -439,17 +406,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -475,15 +431,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -520,15 +469,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "gn gen"
@@ -548,15 +490,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "ninja"
diff --git a/recipes/docs_builder.expected/docs_dry_run.json b/recipes/docs_builder.expected/docs_dry_run.json
index 170815a..8e9517c 100644
--- a/recipes/docs_builder.expected/docs_dry_run.json
+++ b/recipes/docs_builder.expected/docs_dry_run.json
@@ -349,28 +349,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -410,17 +388,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -439,17 +406,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -475,15 +431,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -520,15 +469,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "gn gen"
@@ -548,15 +490,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "ninja"
diff --git a/recipes/env_setup_builder.expected/dry-run.json b/recipes/env_setup_builder.expected/dry-run.json
index 3841f25..e509107 100644
--- a/recipes/env_setup_builder.expected/dry-run.json
+++ b/recipes/env_setup_builder.expected/dry-run.json
@@ -412,28 +412,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -474,17 +452,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -504,17 +471,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -541,15 +497,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -647,15 +596,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
"[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin",
"[START_DIR]/cargo/bin"
]
},
diff --git a/recipes/env_setup_builder.expected/pigweed.json b/recipes/env_setup_builder.expected/pigweed.json
index ba7ef1c..8b82249 100644
--- a/recipes/env_setup_builder.expected/pigweed.json
+++ b/recipes/env_setup_builder.expected/pigweed.json
@@ -412,28 +412,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -474,17 +452,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -504,17 +471,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -541,15 +497,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -647,15 +596,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
"[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin",
"[START_DIR]/cargo/bin"
]
},
diff --git a/recipes/host_tools_builder.expected/success.json b/recipes/host_tools_builder.expected/success.json
index 9ef2b5f..4458773 100644
--- a/recipes/host_tools_builder.expected/success.json
+++ b/recipes/host_tools_builder.expected/success.json
@@ -412,28 +412,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -473,17 +451,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -502,17 +469,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -538,15 +494,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -569,15 +518,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "gn"
@@ -596,15 +538,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "ninja"
diff --git a/recipes/host_tools_builder.expected/windows.json b/recipes/host_tools_builder.expected/windows.json
index 3391911..4d54cfd 100644
--- a/recipes/host_tools_builder.expected/windows.json
+++ b/recipes/host_tools_builder.expected/windows.json
@@ -412,28 +412,6 @@
]
},
{
- "cmd": [
- "cipd.bat",
- "ensure",
- "-root",
- "[START_DIR]\\cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -464,39 +442,7 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]\\cipd\\bin\\python3.exe",
- "[START_DIR]\\cipd\\bin\\python.exe"
- ],
- "env": {
- "PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_ROOT": "[START_DIR]\\checkout"
- },
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
- ],
- "PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
- ]
- },
- "infra_step": true,
- "name": "environment.setup python.setup virtualenv.cp python3.exe python.exe",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\bin\\python.exe",
+ "python3",
"-m",
"venv",
"[START_DIR]\\venv"
@@ -505,17 +451,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
"PW_ROOT": "[START_DIR]\\checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
- ],
- "PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -534,17 +469,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
"PW_ROOT": "[START_DIR]\\checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
- ],
- "PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -570,15 +494,8 @@
"VIRTUAL_ENV": "[START_DIR]\\venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
- ],
"PATH": [
- "[START_DIR]\\venv\\bin",
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
+ "[START_DIR]\\venv\\bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -601,15 +518,8 @@
"VIRTUAL_ENV": "[START_DIR]\\venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
- ],
"PATH": [
- "[START_DIR]\\venv\\bin",
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
+ "[START_DIR]\\venv\\bin"
]
},
"name": "gn"
@@ -628,15 +538,8 @@
"VIRTUAL_ENV": "[START_DIR]\\venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\lib"
- ],
"PATH": [
- "[START_DIR]\\venv\\bin",
- "[START_DIR]\\cipd",
- "[START_DIR]\\cipd\\bin",
- "[START_DIR]\\cipd\\mingw64\\bin"
+ "[START_DIR]\\venv\\bin"
]
},
"name": "ninja"
diff --git a/recipes/pw_presubmit.expected/pigweed.json b/recipes/pw_presubmit.expected/pigweed.json
index fb10206..f046531 100644
--- a/recipes/pw_presubmit.expected/pigweed.json
+++ b/recipes/pw_presubmit.expected/pigweed.json
@@ -412,28 +412,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -473,17 +451,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -502,17 +469,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -538,15 +494,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -572,15 +521,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "foo presubmit"
diff --git a/recipes/pw_presubmit.expected/repo.json b/recipes/pw_presubmit.expected/repo.json
index 0159933..5e84966 100644
--- a/recipes/pw_presubmit.expected/repo.json
+++ b/recipes/pw_presubmit.expected/repo.json
@@ -758,28 +758,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -819,17 +797,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -848,17 +815,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -884,15 +840,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -918,15 +867,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "pw presubmit"
diff --git a/recipes/pw_presubmit.expected/step.json b/recipes/pw_presubmit.expected/step.json
index 230bde3..7d3444f 100644
--- a/recipes/pw_presubmit.expected/step.json
+++ b/recipes/pw_presubmit.expected/step.json
@@ -540,28 +540,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -601,17 +579,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -630,17 +597,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -666,15 +622,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -702,15 +651,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "step1"
@@ -735,15 +677,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "step2"
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 7ebe51d..ef34731 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -349,28 +349,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd",
- "-ensure-file",
- "",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "environment.setup cipd.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {}@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "environment.setup python",
"~followup_annotations": [
@@ -410,17 +388,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.create venv",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -439,17 +406,6 @@
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
- "env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
- "PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
- ]
- },
"name": "environment.setup python.setup virtualenv.upgrade pip",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
@@ -475,15 +431,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "environment.setup python.install packages.pigweed tools",
@@ -521,15 +470,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "bazel clean"
@@ -559,15 +501,8 @@
"VIRTUAL_ENV": "[START_DIR]/venv"
},
"env_prefixes": {
- "LD_LIBRARY_PATH": [
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/lib"
- ],
"PATH": [
- "[START_DIR]/venv/bin",
- "[START_DIR]/cipd",
- "[START_DIR]/cipd/bin",
- "[START_DIR]/cipd/mingw64/bin"
+ "[START_DIR]/venv/bin"
]
},
"name": "bazel build"
