mirror of
				https://github.com/actions/cache.git
				synced 2025-11-04 13:29:10 +08:00 
			
		
		
		
	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 = [
 | 
			
		||||
            "-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",
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								dist/save/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								dist/save/index.js
									
									
									
									
										vendored
									
									
								
							@@ -3017,12 +3017,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",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user