mirror of
				https://gitea.com/actions/setup-node.git
				synced 2025-11-04 13:49:03 +08:00 
			
		
		
		
	format & resolve conflicts
This commit is contained in:
		
							
								
								
									
										4
									
								
								dist/cache-save/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/cache-save/index.js
									
									
									
									
										vendored
									
									
								
							@@ -59283,10 +59283,6 @@ const getCommandOutput = (toolCommand, cwd) => __awaiter(void 0, void 0, void 0,
 | 
			
		||||
});
 | 
			
		||||
exports.getCommandOutput = getCommandOutput;
 | 
			
		||||
const getPackageManagerWorkingDir = () => {
 | 
			
		||||
    const projectDir = core.getInput('project-dir');
 | 
			
		||||
    if (projectDir) {
 | 
			
		||||
        return projectDir;
 | 
			
		||||
    }
 | 
			
		||||
    const cache = core.getInput('cache');
 | 
			
		||||
    if (cache !== 'yarn') {
 | 
			
		||||
        return null;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							@@ -71251,10 +71251,6 @@ const getCommandOutput = (toolCommand, cwd) => __awaiter(void 0, void 0, void 0,
 | 
			
		||||
});
 | 
			
		||||
exports.getCommandOutput = getCommandOutput;
 | 
			
		||||
const getPackageManagerWorkingDir = () => {
 | 
			
		||||
    const projectDir = core.getInput('project-dir');
 | 
			
		||||
    if (projectDir) {
 | 
			
		||||
        return projectDir;
 | 
			
		||||
    }
 | 
			
		||||
    const cache = core.getInput('cache');
 | 
			
		||||
    if (cache !== 'yarn') {
 | 
			
		||||
        return null;
 | 
			
		||||
 
 | 
			
		||||
@@ -52,7 +52,6 @@ export const getCommandOutput = async (
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const getPackageManagerWorkingDir = (): string | null => {
 | 
			
		||||
 | 
			
		||||
  const cache = core.getInput('cache');
 | 
			
		||||
  if (cache !== 'yarn') {
 | 
			
		||||
    return null;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user