2 Commits
Author SHA1 Message Date
kislovdm 26807458dc ok
Create and publish a Docker image / build-and-push-image (push) Failing after 12s
2024-02-07 18:59:43 +03:00
kislovdm 703ee0fb87 ok
Create and publish a Docker image / build-and-push-image (push) Failing after 15s
2024-02-07 18:45:00 +03:00
4 changed files with 91 additions and 89 deletions
+7 -3
View File
@@ -64,12 +64,16 @@ public class App : IApp
return 0; return 0;
} }
var isCodeFreezePeriod = _settings.ReleaseCodeFreeze != "true"; var isCodeFreezePeriod = _settings.ReleaseCodeFreeze == "true";
var periodDescription = isCodeFreezePeriod ? "Code-Freeze. Restrictions may apply" : "Normal"; var periodDescription = isCodeFreezePeriod ? "Code-Freeze. Restrictions may apply" : "Normal";
Console.WriteLine($"Current period is {periodDescription}."); Console.WriteLine($"Current period is {periodDescription}.");
approversDict = FilterApprovers(approversDict, isCodeFreezePeriod); var filtered = FilterApprovers(approversDict, isCodeFreezePeriod);
if (!await IsApproved(mergeRequest, commit, approversDict)) if (!filtered.Any() && isCodeFreezePeriod)
{
filtered = FilterApprovers(approversDict, false);
}
if (!await IsApproved(mergeRequest, commit, filtered))
{ {
return -1; return -1;
} }
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Approve.Checker.Gitlab;
public class ApproversDto public class ApproversDto
{ {
public bool? ForCodeFreeze { get; set; } public bool ForCodeFreeze { get; set; }
public int CountApprovers { get; set; } = 1; public int CountApprovers { get; set; } = 1;
public List<string> Users { get; set; } = new(); public List<string> Users { get; set; } = new();
} }
@@ -7,8 +7,8 @@ using Newtonsoft.Json;
#pragma warning disable CS8618 #pragma warning disable CS8618
namespace Approve.Checker.Gitlab.Dto namespace Approve.Checker.Gitlab.Dto;
{
public sealed class CustomMergeRequest public sealed class CustomMergeRequest
{ {
[JsonProperty("iid")] [JsonProperty("iid")]
@@ -107,4 +107,3 @@ namespace Approve.Checker.Gitlab.Dto
[JsonProperty("merged_by")] [JsonProperty("merged_by")]
public Assignee MergedBy { get; set; } public Assignee MergedBy { get; set; }
} }
}
+2 -3
View File
@@ -1,5 +1,5 @@
namespace Approve.Checker.Gitlab namespace Approve.Checker.Gitlab;
{
public class Settings public class Settings
{ {
public string GitlabUrl = Environment.GetEnvironmentVariable("CI_SERVER_URL") ?? CheckAndThrow("CI_SERVER_URL"); public string GitlabUrl = Environment.GetEnvironmentVariable("CI_SERVER_URL") ?? CheckAndThrow("CI_SERVER_URL");
@@ -15,4 +15,3 @@
throw new ArgumentException($"Please define {name}"); throw new ArgumentException($"Please define {name}");
} }
} }
}