Исправление бага с релизами

This commit is contained in:
Danil Kislov
2019-07-01 17:12:28 +03:00
parent 3e0b3960b5
commit 72f9ccfd5e
4 changed files with 40 additions and 35 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.57
1.0.58
+2 -2
View File
@@ -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)
{
+6 -1
View File
@@ -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;
+3 -3
View File
@@ -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")]