Rebase and rebuild
This commit is contained in:
		
							
								
								
									
										6
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								dist/restore/index.js
									
									
									
									
										vendored
									
									
								
							| @ -3036,12 +3036,8 @@ function createTar(archiveFolder, sourceDirectories) { | |||||||
|         const args = [ |         const args = [ | ||||||
|             "-cz", |             "-cz", | ||||||
|             "-f", |             "-f", | ||||||
| <<<<<<< HEAD |  | ||||||
|             constants_1.CacheFilename, |  | ||||||
|             "-P", |  | ||||||
| ======= |  | ||||||
|             (_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"), |             (_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"), | ||||||
| >>>>>>> Fallback to GNU tar if BSD tar is unavailable |             "-P", | ||||||
|             "-C", |             "-C", | ||||||
|             (_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"), |             (_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"), | ||||||
|             "--files-from", |             "--files-from", | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								dist/save/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								dist/save/index.js
									
									
									
									
										vendored
									
									
								
							| @ -3017,12 +3017,8 @@ function createTar(archiveFolder, sourceDirectories) { | |||||||
|         const args = [ |         const args = [ | ||||||
|             "-cz", |             "-cz", | ||||||
|             "-f", |             "-f", | ||||||
| <<<<<<< HEAD |  | ||||||
|             constants_1.CacheFilename, |  | ||||||
|             "-P", |  | ||||||
| ======= |  | ||||||
|             (_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"), |             (_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"), | ||||||
| >>>>>>> Fallback to GNU tar if BSD tar is unavailable |             "-P", | ||||||
|             "-C", |             "-C", | ||||||
|             (_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"), |             (_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"), | ||||||
|             "--files-from", |             "--files-from", | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Aiqiao Yan
					Aiqiao Yan