zip for caching from parent folder
							parent
							
								
									4b8b76d7ca
								
							
						
					
					
						commit
						e077b50e2b
					
				|  | @ -549,16 +549,16 @@ class Caching { | ||||||
|                 if (!fs_1.default.existsSync(cacheFolder)) { |                 if (!fs_1.default.existsSync(cacheFolder)) { | ||||||
|                     yield cloud_runner_system_1.CloudRunnerSystem.Run(`mkdir -p ${cacheFolder}`); |                     yield cloud_runner_system_1.CloudRunnerSystem.Run(`mkdir -p ${cacheFolder}`); | ||||||
|                 } |                 } | ||||||
|                 process.chdir(`${sourceFolder}`); |                 process.chdir(path_1.default.resolve(sourceFolder, '..')); | ||||||
|                 if (__1.Input.cloudRunnerTests) { |                 if (__1.Input.cloudRunnerTests) { | ||||||
|                     cloud_runner_logger_1.default.log(`Hashed cache folder ${yield lfs_hashing_1.LFSHashing.hashAllFiles(sourceFolder)} ${sourceFolder} ${path_1.default.basename(sourceFolder)}`); |                     cloud_runner_logger_1.default.log(`Hashed cache folder ${yield lfs_hashing_1.LFSHashing.hashAllFiles(sourceFolder)} ${sourceFolder} ${path_1.default.basename(sourceFolder)}`); | ||||||
|                 } |                 } | ||||||
|                 if (__1.Input.cloudRunnerTests) { |                 if (__1.Input.cloudRunnerTests) { | ||||||
|                     yield cloud_runner_system_1.CloudRunnerSystem.Run(`ls`); |                     yield cloud_runner_system_1.CloudRunnerSystem.Run(`ls ${path_1.default.basename(sourceFolder)}`); | ||||||
|                 } |                 } | ||||||
|                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`zip ${cacheKey}.zip *`); |                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`zip ${cacheKey}.zip ${path_1.default.basename(sourceFolder)}`); | ||||||
|                 console_1.assert(fs_1.default.existsSync(`${cacheKey}.zip`), 'cache zip exists'); |                 console_1.assert(fs_1.default.existsSync(`${cacheKey}.zip`), 'cache zip exists'); | ||||||
|                 console_1.assert(fs_1.default.existsSync(path_1.default.resolve(`..`, `${path_1.default.basename(sourceFolder)}`)), 'source folder exists'); |                 console_1.assert(fs_1.default.existsSync(path_1.default.basename(sourceFolder)), 'source folder exists'); | ||||||
|                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv ${cacheKey} ${cacheFolder}`); |                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv ${cacheKey} ${cacheFolder}`); | ||||||
|                 remote_client_logger_1.RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`); |                 remote_client_logger_1.RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`); | ||||||
|                 console_1.assert(fs_1.default.existsSync(`${path_1.default.join(cacheFolder, cacheKey)}.zip`), 'cache zip exists inside cache folder'); |                 console_1.assert(fs_1.default.existsSync(`${path_1.default.join(cacheFolder, cacheKey)}.zip`), 'cache zip exists inside cache folder'); | ||||||
|  |  | ||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							|  | @ -15,7 +15,7 @@ export class Caching { | ||||||
|       if (!fs.existsSync(cacheFolder)) { |       if (!fs.existsSync(cacheFolder)) { | ||||||
|         await CloudRunnerSystem.Run(`mkdir -p ${cacheFolder}`); |         await CloudRunnerSystem.Run(`mkdir -p ${cacheFolder}`); | ||||||
|       } |       } | ||||||
|       process.chdir(`${sourceFolder}`); |       process.chdir(path.resolve(sourceFolder, '..')); | ||||||
| 
 | 
 | ||||||
|       if (Input.cloudRunnerTests) { |       if (Input.cloudRunnerTests) { | ||||||
|         CloudRunnerLogger.log( |         CloudRunnerLogger.log( | ||||||
|  | @ -26,11 +26,11 @@ export class Caching { | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|       if (Input.cloudRunnerTests) { |       if (Input.cloudRunnerTests) { | ||||||
|         await CloudRunnerSystem.Run(`ls`); |         await CloudRunnerSystem.Run(`ls ${path.basename(sourceFolder)}`); | ||||||
|       } |       } | ||||||
|       await CloudRunnerSystem.Run(`zip ${cacheKey}.zip *`); |       await CloudRunnerSystem.Run(`zip ${cacheKey}.zip ${path.basename(sourceFolder)}`); | ||||||
|       assert(fs.existsSync(`${cacheKey}.zip`), 'cache zip exists'); |       assert(fs.existsSync(`${cacheKey}.zip`), 'cache zip exists'); | ||||||
|       assert(fs.existsSync(path.resolve(`..`, `${path.basename(sourceFolder)}`)), 'source folder exists'); |       assert(fs.existsSync(path.basename(sourceFolder)), 'source folder exists'); | ||||||
|       await CloudRunnerSystem.Run(`mv ${cacheKey} ${cacheFolder}`); |       await CloudRunnerSystem.Run(`mv ${cacheKey} ${cacheFolder}`); | ||||||
|       RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`); |       RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`); | ||||||
|       assert(fs.existsSync(`${path.join(cacheFolder, cacheKey)}.zip`), 'cache zip exists inside cache folder'); |       assert(fs.existsSync(`${path.join(cacheFolder, cacheKey)}.zip`), 'cache zip exists inside cache folder'); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue