mirror of
				https://github.com/actions/setup-node.git
				synced 2025-11-04 13:29:12 +08:00 
			
		
		
		
	Throw error only if exit code is note zero. (#358)
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/licensed.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/licensed.yml
									
									
									
									
										vendored
									
									
								
							@@ -18,7 +18,7 @@ jobs:
 | 
			
		||||
      - name: Install licensed
 | 
			
		||||
        run: |
 | 
			
		||||
          cd $RUNNER_TEMP
 | 
			
		||||
          curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/2.12.2/licensed-2.12.2-linux-x64.tar.gz
 | 
			
		||||
          curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.3.1/licensed-3.3.1-linux-x64.tar.gz
 | 
			
		||||
          sudo tar -xzf licensed.tar.gz
 | 
			
		||||
          sudo mv licensed /usr/local/bin/licensed
 | 
			
		||||
      - run: licensed status
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								dist/cache-save/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								dist/cache-save/index.js
									
									
									
									
										vendored
									
									
								
							@@ -3836,8 +3836,11 @@ exports.supportedPackageManagers = {
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
exports.getCommandOutput = (toolCommand) => __awaiter(void 0, void 0, void 0, function* () {
 | 
			
		||||
    const { stdout, stderr, exitCode } = yield exec.getExecOutput(toolCommand);
 | 
			
		||||
    if (stderr) {
 | 
			
		||||
    let { stdout, stderr, exitCode } = yield exec.getExecOutput(toolCommand, undefined, { ignoreReturnCode: true });
 | 
			
		||||
    if (exitCode) {
 | 
			
		||||
        stderr = !stderr.trim()
 | 
			
		||||
            ? `The '${toolCommand}' command failed with exit code: ${exitCode}`
 | 
			
		||||
            : stderr;
 | 
			
		||||
        throw new Error(stderr);
 | 
			
		||||
    }
 | 
			
		||||
    return stdout.trim();
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							@@ -46207,8 +46207,11 @@ exports.supportedPackageManagers = {
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
exports.getCommandOutput = (toolCommand) => __awaiter(void 0, void 0, void 0, function* () {
 | 
			
		||||
    const { stdout, stderr, exitCode } = yield exec.getExecOutput(toolCommand);
 | 
			
		||||
    if (stderr) {
 | 
			
		||||
    let { stdout, stderr, exitCode } = yield exec.getExecOutput(toolCommand, undefined, { ignoreReturnCode: true });
 | 
			
		||||
    if (exitCode) {
 | 
			
		||||
        stderr = !stderr.trim()
 | 
			
		||||
            ? `The '${toolCommand}' command failed with exit code: ${exitCode}`
 | 
			
		||||
            : stderr;
 | 
			
		||||
        throw new Error(stderr);
 | 
			
		||||
    }
 | 
			
		||||
    return stdout.trim();
 | 
			
		||||
 
 | 
			
		||||
@@ -30,9 +30,16 @@ export const supportedPackageManagers: SupportedPackageManagers = {
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const getCommandOutput = async (toolCommand: string) => {
 | 
			
		||||
  const {stdout, stderr, exitCode} = await exec.getExecOutput(toolCommand);
 | 
			
		||||
  let {stdout, stderr, exitCode} = await exec.getExecOutput(
 | 
			
		||||
    toolCommand,
 | 
			
		||||
    undefined,
 | 
			
		||||
    {ignoreReturnCode: true}
 | 
			
		||||
  );
 | 
			
		||||
 | 
			
		||||
  if (stderr) {
 | 
			
		||||
  if (exitCode) {
 | 
			
		||||
    stderr = !stderr.trim()
 | 
			
		||||
      ? `The '${toolCommand}' command failed with exit code: ${exitCode}`
 | 
			
		||||
      : stderr;
 | 
			
		||||
    throw new Error(stderr);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user