Исправление бага с релизами
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
1.0.57
|
||||
1.0.58
|
||||
|
||||
@@ -107,9 +107,9 @@ namespace JiraTimeBot.JiraIntegration
|
||||
{
|
||||
issue = jira.Issues.Queryable.FirstOrDefault(f => f.Key == taskTimeItem.Branch);
|
||||
}
|
||||
catch (Exception)
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
_log.Error($"Ошибка получения задачи из JIRA: {ex.Message} - {ex.InnerException?.Message}");
|
||||
}
|
||||
if (issue == null)
|
||||
{
|
||||
|
||||
@@ -85,7 +85,12 @@ namespace JiraTimeBot.Mercurial
|
||||
|
||||
if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
|
||||
{
|
||||
var branch = task.Description.Replace("Merge with", "").Replace(" ", "");
|
||||
var description = task.Description;
|
||||
if (description.Contains("\n"))
|
||||
{
|
||||
description = description.Split('\n')[0];
|
||||
}
|
||||
var branch = description.Replace("Merge with", "").Replace(" ", "");
|
||||
var release = task.Branch.Replace("release", "");
|
||||
|
||||
task.Branch = branch;
|
||||
|
||||
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.0.57")]
|
||||
[assembly: AssemblyFileVersion("1.0.57")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.57")]
|
||||
[assembly: AssemblyVersion("1.0.58")]
|
||||
[assembly: AssemblyFileVersion("1.0.58")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.58")]
|
||||
|
||||
Reference in New Issue
Block a user