From eff09c1f72a91226d1142cd8d1ca51ab0dedc88d Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 31 Dec 2022 19:32:06 -0600 Subject: [PATCH] Treat Master as a valid branch --- .../HealthCheck/Checks/ReleaseBranchCheckFixture.cs | 6 +++--- src/NzbDrone.Core/Configuration/DeploymentInfoProvider.cs | 2 +- src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs index f503d665e..d277404ad 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs @@ -28,15 +28,15 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks [Test] public void should_return_warning_when_branch_not_valid() { - GivenValidBranch("master"); + GivenValidBranch("test"); Subject.Check().ShouldBeWarning(); } - [TestCase("Develop")] - [TestCase("develop")] [TestCase("nightly")] [TestCase("Nightly")] + [TestCase("develop")] + [TestCase("master")] public void should_return_no_warning_when_branch_valid(string branch) { GivenValidBranch(branch); diff --git a/src/NzbDrone.Core/Configuration/DeploymentInfoProvider.cs b/src/NzbDrone.Core/Configuration/DeploymentInfoProvider.cs index db2229a3d..1f96c44b8 100644 --- a/src/NzbDrone.Core/Configuration/DeploymentInfoProvider.cs +++ b/src/NzbDrone.Core/Configuration/DeploymentInfoProvider.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Configuration var releaseInfoPath = Path.Combine(bin, "release_info"); PackageUpdateMechanism = UpdateMechanism.BuiltIn; - DefaultBranch = "develop"; + DefaultBranch = "master"; if (Path.GetFileName(bin) == "bin" && diskProvider.FileExists(packageInfoPath)) { diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs index dad54475e..6126471a5 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs @@ -31,6 +31,7 @@ namespace NzbDrone.Core.HealthCheck.Checks public enum ReleaseBranches { + Master, Develop, Nightly }