mirror of
				https://git.mirrors.martin98.com/https://github.com/actions/setup-python
				synced 2025-10-31 13:41:06 +08:00 
			
		
		
		
	Merge branch 'main' into ReadmeUpdate
This commit is contained in:
		
						commit
						e084fcae44
					
				
							
								
								
									
										16
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							| @ -65340,16 +65340,13 @@ function resolveVersionInput() { | |||||||
| function run() { | function run() { | ||||||
|     var _a; |     var _a; | ||||||
|     return __awaiter(this, void 0, void 0, function* () { |     return __awaiter(this, void 0, void 0, function* () { | ||||||
|         // According to the README windows binaries do not require to be installed
 |         if (utils_1.IS_MAC) { | ||||||
|         // in the specific location, but Mac and Linux do
 |             process.env['AGENT_TOOLSDIRECTORY'] = '/Users/runner/hostedtoolcache'; | ||||||
|         if (!utils_1.IS_WINDOWS && !((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim())) { |         } | ||||||
|             if (utils_1.IS_LINUX) |         if ((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim()) { | ||||||
|                 process.env['AGENT_TOOLSDIRECTORY'] = '/opt/hostedtoolcache'; |  | ||||||
|             else |  | ||||||
|                 process.env['AGENT_TOOLSDIRECTORY'] = '/Users/runner/hostedtoolcache'; |  | ||||||
|             process.env['RUNNER_TOOL_CACHE'] = 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']}`); |         core.debug(`Python is expected to be installed into ${process.env['RUNNER_TOOL_CACHE']}`); | ||||||
|         try { |         try { | ||||||
|             const version = resolveVersionInput(); |             const version = resolveVersionInput(); | ||||||
|             const checkLatest = core.getBooleanInput('check-latest'); |             const checkLatest = core.getBooleanInput('check-latest'); | ||||||
| @ -65425,7 +65422,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { | |||||||
|     return (mod && mod.__esModule) ? mod : { "default": mod }; |     return (mod && mod.__esModule) ? mod : { "default": mod }; | ||||||
| }; | }; | ||||||
| Object.defineProperty(exports, "__esModule", ({ value: true })); | Object.defineProperty(exports, "__esModule", ({ value: true })); | ||||||
| exports.logWarning = exports.getLinuxOSReleaseInfo = exports.isCacheFeatureAvailable = exports.isGhes = exports.validatePythonVersionFormatForPyPy = exports.writeExactPyPyVersionFile = exports.readExactPyPyVersionFile = exports.getPyPyVersionFromPath = exports.isNightlyKeyword = exports.validateVersion = exports.createSymlinkInFolder = exports.WINDOWS_PLATFORMS = exports.WINDOWS_ARCHS = exports.IS_LINUX = exports.IS_WINDOWS = void 0; | exports.logWarning = exports.getLinuxOSReleaseInfo = exports.isCacheFeatureAvailable = exports.isGhes = exports.validatePythonVersionFormatForPyPy = exports.writeExactPyPyVersionFile = exports.readExactPyPyVersionFile = exports.getPyPyVersionFromPath = exports.isNightlyKeyword = exports.validateVersion = exports.createSymlinkInFolder = exports.WINDOWS_PLATFORMS = exports.WINDOWS_ARCHS = exports.IS_MAC = exports.IS_LINUX = exports.IS_WINDOWS = void 0; | ||||||
| const cache = __importStar(__nccwpck_require__(7799)); | const cache = __importStar(__nccwpck_require__(7799)); | ||||||
| const core = __importStar(__nccwpck_require__(2186)); | const core = __importStar(__nccwpck_require__(2186)); | ||||||
| const fs_1 = __importDefault(__nccwpck_require__(7147)); | const fs_1 = __importDefault(__nccwpck_require__(7147)); | ||||||
| @ -65434,6 +65431,7 @@ const semver = __importStar(__nccwpck_require__(1383)); | |||||||
| const exec = __importStar(__nccwpck_require__(1514)); | const exec = __importStar(__nccwpck_require__(1514)); | ||||||
| exports.IS_WINDOWS = process.platform === 'win32'; | exports.IS_WINDOWS = process.platform === 'win32'; | ||||||
| exports.IS_LINUX = process.platform === 'linux'; | exports.IS_LINUX = process.platform === 'linux'; | ||||||
|  | exports.IS_MAC = process.platform === 'darwin'; | ||||||
| exports.WINDOWS_ARCHS = ['x86', 'x64']; | exports.WINDOWS_ARCHS = ['x86', 'x64']; | ||||||
| exports.WINDOWS_PLATFORMS = ['win32', 'win64']; | exports.WINDOWS_PLATFORMS = ['win32', 'win64']; | ||||||
| const PYPY_VERSION_FILE = 'PYPY_VERSION'; | const PYPY_VERSION_FILE = 'PYPY_VERSION'; | ||||||
|  | |||||||
| @ -5,12 +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 { | import {isCacheFeatureAvailable, logWarning, IS_MAC} from './utils'; | ||||||
|   isCacheFeatureAvailable, |  | ||||||
|   logWarning, |  | ||||||
|   IS_LINUX, |  | ||||||
|   IS_WINDOWS |  | ||||||
| } from './utils'; |  | ||||||
| 
 | 
 | ||||||
| function isPyPyVersion(versionSpec: string) { | function isPyPyVersion(versionSpec: string) { | ||||||
|   return versionSpec.startsWith('pypy'); |   return versionSpec.startsWith('pypy'); | ||||||
| @ -68,15 +63,16 @@ function resolveVersionInput(): string { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| async function run() { | async function run() { | ||||||
|   // According to the README windows binaries do not require to be installed
 |   if (IS_MAC) { | ||||||
|   // in the specific location, but Mac and Linux do
 |     process.env['AGENT_TOOLSDIRECTORY'] = '/Users/runner/hostedtoolcache'; | ||||||
|   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'; |   if (process.env.AGENT_TOOLSDIRECTORY?.trim()) { | ||||||
|     process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY']; |     process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY']; | ||||||
|   } |   } | ||||||
|  | 
 | ||||||
|   core.debug( |   core.debug( | ||||||
|     `Python is expected to be installed into RUNNER_TOOL_CACHE=${process.env['RUNNER_TOOL_CACHE']}` |     `Python is expected to be installed into ${process.env['RUNNER_TOOL_CACHE']}` | ||||||
|   ); |   ); | ||||||
|   try { |   try { | ||||||
|     const version = resolveVersionInput(); |     const version = resolveVersionInput(); | ||||||
|  | |||||||
| @ -7,6 +7,7 @@ import * as exec from '@actions/exec'; | |||||||
| 
 | 
 | ||||||
| export const IS_WINDOWS = process.platform === 'win32'; | export const IS_WINDOWS = process.platform === 'win32'; | ||||||
| export const IS_LINUX = process.platform === 'linux'; | export const IS_LINUX = process.platform === 'linux'; | ||||||
|  | export const IS_MAC = process.platform === 'darwin'; | ||||||
| export const WINDOWS_ARCHS = ['x86', 'x64']; | export const WINDOWS_ARCHS = ['x86', 'x64']; | ||||||
| export const WINDOWS_PLATFORMS = ['win32', 'win64']; | export const WINDOWS_PLATFORMS = ['win32', 'win64']; | ||||||
| const PYPY_VERSION_FILE = 'PYPY_VERSION'; | const PYPY_VERSION_FILE = 'PYPY_VERSION'; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Ivan
						Ivan