Compare commits

..

No commits in common. "main" and "1.1.2" have entirely different histories.
main ... 1.1.2

2 changed files with 7 additions and 15 deletions

View File

@ -43,23 +43,22 @@ namespace CodeRelease.BLL
process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => process.OutputDataReceived += new DataReceivedEventHandler((sender, e) =>
{ {
//Log.Logger.Information($"linux执行出错OutputDataReceived命令{command}"); //Log.Logger.Information($"linux执行出错OutputDataReceived命令{command}");
//Log.Logger.Information($"linux执行出错OutputDataReceivedOutput{JsonConvert.SerializeObject(e)}"); Log.Logger.Information($"linux执行出错OutputDataReceivedOutput{JsonConvert.SerializeObject(e)}");
if (!string.IsNullOrEmpty(e.Data)) if (!string.IsNullOrEmpty(e.Data))
{ {
//Console.WriteLine($"Output: {e.Data}"); Console.WriteLine($"Output: {e.Data}");
outputDataReceived = e.Data;
outputDataReceived += e.Data + "\n";
} }
}); });
process.ErrorDataReceived += new DataReceivedEventHandler((sender, e) => process.ErrorDataReceived += new DataReceivedEventHandler((sender, e) =>
{ {
// Log.Logger.Information($"linux执行出错ErrorDataReceived命令{command}"); // Log.Logger.Information($"linux执行出错ErrorDataReceived命令{command}");
//Log.Logger.Information($"linux执行出错ErrorDataReceivedOutput:{JsonConvert.SerializeObject(e)}"); Log.Logger.Information($"linux执行出错ErrorDataReceivedOutput:{JsonConvert.SerializeObject(e)}");
if (!string.IsNullOrEmpty(e.Data)) if (!string.IsNullOrEmpty(e.Data))
{ {
//Console.WriteLine($"Error: {e.Data}"); Console.WriteLine($"Error: {e.Data}");
errorDataReceived += e.Data + "\n"; errorDataReceived = e.Data;
} }
}); });
@ -75,9 +74,7 @@ namespace CodeRelease.BLL
// 输出退出代码 // 输出退出代码
//Console.WriteLine($"Process exited with code {process.ExitCode}"); //Console.WriteLine($"Process exited with code {process.ExitCode}");
Log.Logger.Information($"执行结束:{process.ExitCode}"); Log.Logger.Information($"执行结束 {process.ExitCode}");
Log.Logger.Information($"{outputDataReceived}");
Log.Logger.Information($"{errorDataReceived}");
exitCode = process.ExitCode; exitCode = process.ExitCode;
} }
} }

View File

@ -90,11 +90,6 @@ namespace CodeRelease.Controllers
var version = releaseAction.Release.TagName; var version = releaseAction.Release.TagName;
var mingling = giteaWebhookConfig.MakeFile var mingling = giteaWebhookConfig.MakeFile
.Replace("{version}", version) .Replace("{version}", version)
.Replace("{description}", releaseAction.Release.Body)
.Replace("{name}", version)
//.Replace("{version}", version)
//.Replace("{version}", version)
//.Replace("{version}", version)
//.Replace("{dir_file_path}", download + "/") //.Replace("{dir_file_path}", download + "/")
.Replace("{target_commitish}", releaseAction.Release.TargetCommitish); .Replace("{target_commitish}", releaseAction.Release.TargetCommitish);
Log.Logger.Information("执行linux命令{mingling}", mingling); Log.Logger.Information("执行linux命令{mingling}", mingling);