Fix setting of CIPD variables
Previously we set PW_CIPD_INSTALL_DIR and PW_PIGWEED_CIPD_INSTALL_DIR.
This didn't extend to multiple package files, so take the base name of
each file, without the extension, and capitalized, and set
PW_{}_CIPD_INSTALL_DIR. For now in LUCI everything is installed to the
same place, so all these variables are equal, but they all need to be
set because they're used from different parts of pw subcommands and the
build.
Change-Id: Ib3ee31a8ed9cfe19d8516499928a4d7bc6ace394
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/13040
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
diff --git a/recipe_modules/environment/api.py b/recipe_modules/environment/api.py
index 2e4f146..c49377b 100644
--- a/recipe_modules/environment/api.py
+++ b/recipe_modules/environment/api.py
@@ -56,16 +56,20 @@
"""Install CIPD packages."""
with self.m.step.nest('setup cipd'):
+ 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
+
packages = self.m.file.read_json('read {}'.format(json_path), json_path)
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._cipd_dir = self.m.path['start_dir'].join('cipd')
self.m.cipd.ensure(self._cipd_dir, ensure_file)
self._path_prefixes.append(self._cipd_dir)
@@ -73,8 +77,6 @@
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._env['PW_CIPD_INSTALL_DIR'] = self._cipd_dir
- self._env['PW_PIGWEED_CIPD_INSTALL_DIR'] = self._cipd_dir
def _find_python_packages(self, roots):
"""Return all folders with setup.py entries.
diff --git a/recipe_modules/environment/tests/full.expected/windows.json b/recipe_modules/environment/tests/full.expected/windows.json
index 8ec0cfc..ccfcbcf 100644
--- a/recipe_modules/environment/tests/full.expected/windows.json
+++ b/recipe_modules/environment/tests/full.expected/windows.json
@@ -123,7 +123,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
@@ -153,7 +153,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
@@ -184,7 +184,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
@@ -222,7 +222,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]\\venv"
},
@@ -255,7 +255,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]\\venv"
},
diff --git a/recipe_modules/environment/tests/full.expected/with_cargo.json b/recipe_modules/environment/tests/full.expected/with_cargo.json
index 2b436a6..b42cfe5 100644
--- a/recipe_modules/environment/tests/full.expected/with_cargo.json
+++ b/recipe_modules/environment/tests/full.expected/with_cargo.json
@@ -119,7 +119,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
@@ -150,7 +150,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]"
},
"env_prefixes": {
@@ -188,7 +188,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -221,7 +221,7 @@
"env": {
"FOO_ROOT": "[START_DIR]",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -287,7 +287,7 @@
"FOO_ROOT": "[START_DIR]",
"PW_CARGO_SETUP": "1",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+ "PW_CIPD_PACKAGES_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/docs_builder.expected/docs.json b/recipes/docs_builder.expected/docs.json
index 77f246a..e82669c 100644
--- a/recipes/docs_builder.expected/docs.json
+++ b/recipes/docs_builder.expected/docs.json
@@ -408,7 +408,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -438,7 +437,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -473,7 +471,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -519,7 +516,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -548,7 +544,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/docs_builder.expected/docs_dry_run.json b/recipes/docs_builder.expected/docs_dry_run.json
index ddf7481..170815a 100644
--- a/recipes/docs_builder.expected/docs_dry_run.json
+++ b/recipes/docs_builder.expected/docs_dry_run.json
@@ -408,7 +408,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -438,7 +437,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -473,7 +471,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -519,7 +516,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -548,7 +544,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/env_setup_builder.expected/dry-run.json b/recipes/env_setup_builder.expected/dry-run.json
index b58cbf3..3841f25 100644
--- a/recipes/env_setup_builder.expected/dry-run.json
+++ b/recipes/env_setup_builder.expected/dry-run.json
@@ -472,7 +472,6 @@
"env": {
"FOO_ROOT": "[START_DIR]/checkout",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -503,7 +502,6 @@
"env": {
"FOO_ROOT": "[START_DIR]/checkout",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -539,7 +537,6 @@
"env": {
"FOO_ROOT": "[START_DIR]/checkout",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -646,7 +643,6 @@
"GOCACHE": "[CACHE]/go",
"PW_CARGO_SETUP": "1",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/env_setup_builder.expected/pigweed.json b/recipes/env_setup_builder.expected/pigweed.json
index e570451..ba7ef1c 100644
--- a/recipes/env_setup_builder.expected/pigweed.json
+++ b/recipes/env_setup_builder.expected/pigweed.json
@@ -472,7 +472,6 @@
"env": {
"FOO_ROOT": "[START_DIR]/checkout",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -503,7 +502,6 @@
"env": {
"FOO_ROOT": "[START_DIR]/checkout",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -539,7 +537,6 @@
"env": {
"FOO_ROOT": "[START_DIR]/checkout",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -646,7 +643,6 @@
"GOCACHE": "[CACHE]/go",
"PW_CARGO_SETUP": "1",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/host_tools_builder.expected/success.json b/recipes/host_tools_builder.expected/success.json
index 28118aa..a8b1295 100644
--- a/recipes/host_tools_builder.expected/success.json
+++ b/recipes/host_tools_builder.expected/success.json
@@ -471,7 +471,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -501,7 +500,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -536,7 +534,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -568,7 +565,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -597,7 +593,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/pw_presubmit.expected/pigweed.json b/recipes/pw_presubmit.expected/pigweed.json
index 18053fa..fb10206 100644
--- a/recipes/pw_presubmit.expected/pigweed.json
+++ b/recipes/pw_presubmit.expected/pigweed.json
@@ -471,7 +471,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -501,7 +500,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -536,7 +534,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -571,7 +568,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/pw_presubmit.expected/repo.json b/recipes/pw_presubmit.expected/repo.json
index c05143c..0159933 100644
--- a/recipes/pw_presubmit.expected/repo.json
+++ b/recipes/pw_presubmit.expected/repo.json
@@ -817,7 +817,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -847,7 +846,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -882,7 +880,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -917,7 +914,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/pw_presubmit.expected/step.json b/recipes/pw_presubmit.expected/step.json
index 4a07448..230bde3 100644
--- a/recipes/pw_presubmit.expected/step.json
+++ b/recipes/pw_presubmit.expected/step.json
@@ -599,7 +599,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -629,7 +628,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -664,7 +662,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -701,7 +698,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -735,7 +731,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 00cba74..7ebe51d 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -408,7 +408,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -438,7 +437,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
},
"env_prefixes": {
@@ -473,7 +471,6 @@
],
"env": {
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -520,7 +517,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
@@ -559,7 +555,6 @@
"env": {
"GOCACHE": "[CACHE]/go",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
"VIRTUAL_ENV": "[START_DIR]/venv"
},
diff --git a/recipes/xrefs.py b/recipes/xrefs.py
index a30115d..0732e49 100644
--- a/recipes/xrefs.py
+++ b/recipes/xrefs.py
@@ -53,7 +53,7 @@
out = api.path['start_dir'].join('out')
api.file.ensure_directory('mkdir out', out)
- kythe = api.environment.PW_PIGWEED_CIPD_INSTALL_DIR.join('kythe')
+ kythe = api.environment.PW_CIPD_INSTALL_DIR.join('kythe')
with api.environment(), api.context(cwd=api.checkout.root):
clean = [
