mirror of
				https://github.com/actions/setup-node.git
				synced 2025-11-01 00:23:59 +08:00 
			
		
		
		
	fix: add arch to cached path (#843)
* fix: add arch to cached path * fix: change from using env to os module * fix: use process.env.RUNNER_OS instead of os.platform() * fix: remove unused var
This commit is contained in:
		
							
								
								
									
										4
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							| @@ -93303,6 +93303,7 @@ const core = __importStar(__nccwpck_require__(2186)); | ||||
| const glob = __importStar(__nccwpck_require__(8090)); | ||||
| const path_1 = __importDefault(__nccwpck_require__(1017)); | ||||
| const fs_1 = __importDefault(__nccwpck_require__(7147)); | ||||
| const os_1 = __importDefault(__nccwpck_require__(2037)); | ||||
| const constants_1 = __nccwpck_require__(9042); | ||||
| const cache_utils_1 = __nccwpck_require__(1678); | ||||
| const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0, void 0, void 0, function* () { | ||||
| @@ -93311,6 +93312,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0, | ||||
|         throw new Error(`Caching for '${packageManager}' is not supported`); | ||||
|     } | ||||
|     const platform = process.env.RUNNER_OS; | ||||
|     const arch = os_1.default.arch(); | ||||
|     const cachePaths = yield (0, cache_utils_1.getCacheDirectories)(packageManagerInfo, cacheDependencyPath); | ||||
|     core.saveState(constants_1.State.CachePaths, cachePaths); | ||||
|     const lockFilePath = cacheDependencyPath | ||||
| @@ -93320,7 +93322,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0, | ||||
|     if (!fileHash) { | ||||
|         throw new Error('Some specified paths were not resolved, unable to cache dependencies.'); | ||||
|     } | ||||
|     const keyPrefix = `node-cache-${platform}-${packageManager}`; | ||||
|     const keyPrefix = `node-cache-${platform}-${arch}-${packageManager}`; | ||||
|     const primaryKey = `${keyPrefix}-${fileHash}`; | ||||
|     core.debug(`primary key is ${primaryKey}`); | ||||
|     core.saveState(constants_1.State.CachePrimaryKey, primaryKey); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Peng Xiao
					Peng Xiao