Skip to content

Only emit one error if capturing stdout goes wrong during assembler checkout #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

Only emit one error if capturing stdout goes wrong during assembler checkout #1225

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8086b71
Only emit one error if capturing stdout goes wrong during assembler c…
Mpdreamz May 7, 2025
3e4e2e6
Update src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
Mpdreamz May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@ private bool TryUpdateSource(string name, string branch, string relativePath, ID
_logger.LogInformation("Pull: {Name}\t{Branch}\t{RelativePath}", name, branch, relativePath);
// --allow-unrelated-histories due to shallow clones not finding a common ancestor
ExecIn(checkoutFolder, "git", "pull", "--depth", "1", "--allow-unrelated-histories", "--no-ff");
head = Capture(checkoutFolder, "git", "rev-parse", "HEAD");
return true;
}
catch (Exception e)
{
Expand All @@ -136,9 +134,12 @@ private bool TryUpdateSource(string name, string branch, string relativePath, ID
checkoutFolder.Delete(true);
checkoutFolder.Refresh();
}
return false;
}

return false;
head = Capture(checkoutFolder, "git", "rev-parse", "HEAD");

return true;
}

private string CheckoutFromScratch(Repository repository, string name, string branch, string relativePath,
Expand Down Expand Up @@ -183,19 +184,26 @@ private void ExecIn(IDirectoryInfo? workingDirectory, string binary, params stri
// ReSharper disable once UnusedMember.Local
private string Capture(IDirectoryInfo? workingDirectory, string binary, params string[] args)
{
// Try 10 times to capture the output of the command, if it fails we'll throw an exception on the last try
for (var i = 0; i < 9; i++)
// Try 10 times to capture the output of the command, if it fails, we'll throw an exception on the last try
Exception? e = null;
for (var i = 0; i <= 9; i++)
{
try
{
return CaptureOutput();
}
catch
catch (Exception ex)
{
// ignored
if (ex is not null)
e = ex;
}
}
return CaptureOutput();

if (e is not null)
collector.EmitError("", "failure capturing stdout", e);


return string.Empty;

string CaptureOutput()
{
Expand All @@ -208,9 +216,9 @@ string CaptureOutput()
ConsoleOutWriter = NoopConsoleWriter.Instance
};
var result = Proc.Start(arguments);
if (result.ExitCode != 0)
collector.EmitError("", $"Exit code: {result.ExitCode} while executing {binary} {string.Join(" ", args)} in {workingDirectory}");
var line = result.ConsoleOut.FirstOrDefault()?.Line ?? throw new Exception($"No output captured for {binary}: {workingDirectory}");
var line = result.ExitCode != 0
? throw new Exception($"Exit code is nto 0 received {result.ExitCode} from {binary}: {workingDirectory}")
: result.ConsoleOut.FirstOrDefault()?.Line ?? throw new Exception($"No output captured for {binary}: {workingDirectory}");
return line;
}
}
Expand Down
Loading