Merge pull request #338 from akv-demo/main

Force TOOLCACHE_ROOT to be equal AGENT_TOOLSDIRECTORY
actions · Apr 15, 2022 · 91712e1 · 91712e1
2 parents 98f2ad0 + f4b66de
commit 91712e1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -6083,7 +6083,15 @@ function cacheDependencies(cache, pythonVersion) {
     });
 }
 function run() {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        if ((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim()) {
+            core.debug(`Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`);
+            process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
+        }
+        else {
+            core.debug(`Python is expected to be installed into RUNNER_TOOL_CACHE==${process.env['RUNNER_TOOL_CACHE']}`);
+        }
         try {
             const version = core.getInput('python-version');
             if (version) {

diff --git a/src/setup-python.ts b/src/setup-python.ts
@@ -22,6 +22,16 @@ async function cacheDependencies(cache: string, pythonVersion: string) {
 }
 
 async function run() {
+  if (process.env.AGENT_TOOLSDIRECTORY?.trim()) {
+    core.debug(
+      `Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`
+    );
+    process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
+  } else {
+    core.debug(
+      `Python is expected to be installed into RUNNER_TOOL_CACHE==${process.env['RUNNER_TOOL_CACHE']}`
+    );
+  }
   try {
     const version = core.getInput('python-version');
     if (version) {