Handle each OS in its own way
This commit is contained in:
		
							parent
							
								
									7199395312
								
							
						
					
					
						commit
						5d9fdcab75
					
				
							
								
								
									
										7
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							| @ -5325,8 +5325,11 @@ function cacheDependencies(cache, pythonVersion) { | |||||||
| function run() { | function run() { | ||||||
|     var _a; |     var _a; | ||||||
|     return __awaiter(this, void 0, void 0, function* () { |     return __awaiter(this, void 0, void 0, function* () { | ||||||
|         if (!((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim())) { |         if (!utils_1.IS_WINDOWS && !((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim())) { | ||||||
|             process.env['AGENT_TOOLSDIRECTORY'] = '/opt/hostedtoolcache'; |             if (utils_1.IS_LINUX) | ||||||
|  |                 process.env['AGENT_TOOLSDIRECTORY'] = '/opt/hostedtoolcache'; | ||||||
|  |             else | ||||||
|  |                 process.env['AGENT_TOOLSDIRECTORY'] = '/Users/runner/hostedtoolcache'; | ||||||
|         } |         } | ||||||
|         core.debug(`Python is expected to be installed into AGENT_TOOLSDIRECTORY=${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']; |         process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY']; | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ import * as path from 'path'; | |||||||
| import * as os from 'os'; | import * as os from 'os'; | ||||||
| import fs from 'fs'; | import fs from 'fs'; | ||||||
| import {getCacheDistributor} from './cache-distributions/cache-factory'; | import {getCacheDistributor} from './cache-distributions/cache-factory'; | ||||||
| import {isCacheFeatureAvailable} from './utils'; | import {isCacheFeatureAvailable, IS_LINUX, IS_WINDOWS} from './utils'; | ||||||
| 
 | 
 | ||||||
| function isPyPyVersion(versionSpec: string) { | function isPyPyVersion(versionSpec: string) { | ||||||
|   return versionSpec.startsWith('pypy'); |   return versionSpec.startsWith('pypy'); | ||||||
| @ -49,8 +49,9 @@ function resolveVersionInput(): string { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| async function run() { | async function run() { | ||||||
|   if (!process.env.AGENT_TOOLSDIRECTORY?.trim()) { |   if (!IS_WINDOWS && !process.env.AGENT_TOOLSDIRECTORY?.trim()) { | ||||||
|     process.env['AGENT_TOOLSDIRECTORY'] = '/opt/hostedtoolcache'; |     if (IS_LINUX) process.env['AGENT_TOOLSDIRECTORY'] = '/opt/hostedtoolcache'; | ||||||
|  |     else process.env['AGENT_TOOLSDIRECTORY'] = '/Users/runner/hostedtoolcache'; | ||||||
|   } |   } | ||||||
|   core.debug( |   core.debug( | ||||||
|     `Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}` |     `Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}` | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user