mirror of
				https://kkgithub.com/actions/cache.git
				synced 2025-10-31 18:51:49 +08:00 
			
		
		
		
	Merge fixes
This commit is contained in:
		
							
								
								
									
										4
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							| @ -4554,7 +4554,6 @@ var Events; | ||||
|     Events["Push"] = "push"; | ||||
|     Events["PullRequest"] = "pull_request"; | ||||
| })(Events = exports.Events || (exports.Events = {})); | ||||
| <<<<<<< HEAD | ||||
| var CacheFilename; | ||||
| (function (CacheFilename) { | ||||
|     CacheFilename["Gzip"] = "cache.tgz"; | ||||
| @ -4569,10 +4568,7 @@ var CompressionMethod; | ||||
| // over the socket during this period, the socket is destroyed and the download | ||||
| // is aborted. | ||||
| exports.SocketTimeout = 5000; | ||||
| ======= | ||||
| exports.RefKey = "GITHUB_REF"; | ||||
| exports.CacheFilename = "cache.tgz"; | ||||
| >>>>>>> Allow all events to access cache | ||||
|  | ||||
|  | ||||
| /***/ }), | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Aiqiao Yan
					Aiqiao Yan