Exclude windows from the fix

actions · May 6, 2022 · 7835f99 · 7835f99
1 parent d0e6378
commit 7835f99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -6085,14 +6085,16 @@ function cacheDependencies(cache, pythonVersion) {
 function run() {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        // According to the README windows binaries do not require to be installed
+        // in the specific location, but Mac and Linux do
         if (!utils_1.IS_WINDOWS && !((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim())) {
             if (utils_1.IS_LINUX)
                 process.env['AGENT_TOOLSDIRECTORY'] = '/opt/hostedtoolcache';
             else
                 process.env['AGENT_TOOLSDIRECTORY'] = '/Users/runner/hostedtoolcache';
+            process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
         }
-        core.debug(`Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`);
-        process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
+        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,14 +22,16 @@ async function cacheDependencies(cache: string, pythonVersion: string) {
 }
 
 async function run() {
+  // According to the README windows binaries do not require to be installed
+  // in the specific location, but Mac and Linux do
   if (!IS_WINDOWS && !process.env.AGENT_TOOLSDIRECTORY?.trim()) {
     if (IS_LINUX) process.env['AGENT_TOOLSDIRECTORY'] = '/opt/hostedtoolcache';
     else process.env['AGENT_TOOLSDIRECTORY'] = '/Users/runner/hostedtoolcache';
+    process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
   }
   core.debug(
-    `Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`
+    `Python is expected to be installed into RUNNER_TOOL_CACHE=${process.env['RUNNER_TOOL_CACHE']}`
   );
-  process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
   try {
     const version = core.getInput('python-version');
     if (version) {