mirror of https://github.com/actions/cache.git
				
				
				
			Rebase and rebuild
This commit is contained in:
		
							parent
							
								
									306f72536b
								
							
						
					
					
						commit
						7ccdf5c70d
					
				| 
						 | 
				
			
			@ -5041,12 +5041,8 @@ function createTar(archiveFolder, sourceDirectories) {
 | 
			
		|||
        const args = [
 | 
			
		||||
            "-cz",
 | 
			
		||||
            "-f",
 | 
			
		||||
<<<<<<< HEAD
 | 
			
		||||
            constants_1.CacheFilename,
 | 
			
		||||
            "-P",
 | 
			
		||||
=======
 | 
			
		||||
            (_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
 | 
			
		||||
>>>>>>> Fallback to GNU tar if BSD tar is unavailable
 | 
			
		||||
            "-P",
 | 
			
		||||
            "-C",
 | 
			
		||||
            (_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
 | 
			
		||||
            "--files-from",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5018,12 +5018,8 @@ function createTar(archiveFolder, sourceDirectories) {
 | 
			
		|||
        const args = [
 | 
			
		||||
            "-cz",
 | 
			
		||||
            "-f",
 | 
			
		||||
<<<<<<< HEAD
 | 
			
		||||
            constants_1.CacheFilename,
 | 
			
		||||
            "-P",
 | 
			
		||||
=======
 | 
			
		||||
            (_a = constants_1.CacheFilename) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, "/"),
 | 
			
		||||
>>>>>>> Fallback to GNU tar if BSD tar is unavailable
 | 
			
		||||
            "-P",
 | 
			
		||||
            "-C",
 | 
			
		||||
            (_b = workingDirectory) === null || _b === void 0 ? void 0 : _b.replace(/\\/g, "/"),
 | 
			
		||||
            "--files-from",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue