Fix nested Library cache
							parent
							
								
									82310f7768
								
							
						
					
					
						commit
						93bd0d6012
					
				|  | @ -537,9 +537,6 @@ 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}`); | ||||||
|                 } |                 } | ||||||
|                 if (__1.Input.cloudRunnerTests) { |  | ||||||
|                     yield Caching.printFullCacheHierarchySize(); |  | ||||||
|                 } |  | ||||||
|                 process.chdir(`${sourceFolder}`); |                 process.chdir(`${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)}`); | ||||||
|  | @ -555,9 +552,6 @@ class Caching { | ||||||
|                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`); |                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv ${cacheKey}.zip ${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`)); |                 console_1.assert(fs_1.default.existsSync(`${path_1.default.join(cacheFolder, cacheKey)}.zip`)); | ||||||
|                 if (__1.Input.cloudRunnerTests) { |  | ||||||
|                     yield Caching.printFullCacheHierarchySize(); |  | ||||||
|                 } |  | ||||||
|             } |             } | ||||||
|             catch (error) { |             catch (error) { | ||||||
|                 process.chdir(`${startPath}`); |                 process.chdir(`${startPath}`); | ||||||
|  | @ -866,6 +860,9 @@ class SetupCloudRunnerRepository { | ||||||
|                 remote_client_logger_1.RemoteClientLogger.log(`${cloud_runner_state_1.CloudRunnerState.buildParams.branch}`); |                 remote_client_logger_1.RemoteClientLogger.log(`${cloud_runner_state_1.CloudRunnerState.buildParams.branch}`); | ||||||
|                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`git checkout ${cloud_runner_state_1.CloudRunnerState.buildParams.branch}`); |                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`git checkout ${cloud_runner_state_1.CloudRunnerState.buildParams.branch}`); | ||||||
|                 remote_client_logger_1.RemoteClientLogger.log(`Checked out ${process.env.GITHUB_SHA}`); |                 remote_client_logger_1.RemoteClientLogger.log(`Checked out ${process.env.GITHUB_SHA}`); | ||||||
|  |                 if (__1.Input.cloudRunnerTests) { | ||||||
|  |                     yield caching_1.Caching.printFullCacheHierarchySize(); | ||||||
|  |                 } | ||||||
|             } |             } | ||||||
|             catch (error) { |             catch (error) { | ||||||
|                 throw error; |                 throw error; | ||||||
|  |  | ||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							|  | @ -15,10 +15,6 @@ export class Caching { | ||||||
|       if (!fs.existsSync(cacheFolder)) { |       if (!fs.existsSync(cacheFolder)) { | ||||||
|         await CloudRunnerSystem.Run(`mkdir -p ${cacheFolder}`); |         await CloudRunnerSystem.Run(`mkdir -p ${cacheFolder}`); | ||||||
|       } |       } | ||||||
| 
 |  | ||||||
|       if (Input.cloudRunnerTests) { |  | ||||||
|         await Caching.printFullCacheHierarchySize(); |  | ||||||
|       } |  | ||||||
|       process.chdir(`${sourceFolder}`); |       process.chdir(`${sourceFolder}`); | ||||||
| 
 | 
 | ||||||
|       if (Input.cloudRunnerTests) { |       if (Input.cloudRunnerTests) { | ||||||
|  | @ -43,10 +39,6 @@ export class Caching { | ||||||
|       await CloudRunnerSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`); |       await CloudRunnerSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`); | ||||||
|       RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`); |       RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`); | ||||||
|       assert(fs.existsSync(`${path.join(cacheFolder, cacheKey)}.zip`)); |       assert(fs.existsSync(`${path.join(cacheFolder, cacheKey)}.zip`)); | ||||||
| 
 |  | ||||||
|       if (Input.cloudRunnerTests) { |  | ||||||
|         await Caching.printFullCacheHierarchySize(); |  | ||||||
|       } |  | ||||||
|     } catch (error) { |     } catch (error) { | ||||||
|       process.chdir(`${startPath}`); |       process.chdir(`${startPath}`); | ||||||
|       throw error; |       throw error; | ||||||
|  |  | ||||||
|  | @ -68,6 +68,9 @@ export class SetupCloudRunnerRepository { | ||||||
|       RemoteClientLogger.log(`${CloudRunnerState.buildParams.branch}`); |       RemoteClientLogger.log(`${CloudRunnerState.buildParams.branch}`); | ||||||
|       await CloudRunnerSystem.Run(`git checkout ${CloudRunnerState.buildParams.branch}`); |       await CloudRunnerSystem.Run(`git checkout ${CloudRunnerState.buildParams.branch}`); | ||||||
|       RemoteClientLogger.log(`Checked out ${process.env.GITHUB_SHA}`); |       RemoteClientLogger.log(`Checked out ${process.env.GITHUB_SHA}`); | ||||||
|  |       if (Input.cloudRunnerTests) { | ||||||
|  |         await Caching.printFullCacheHierarchySize(); | ||||||
|  |       } | ||||||
|     } catch (error) { |     } catch (error) { | ||||||
|       throw error; |       throw error; | ||||||
|     } |     } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue