github-mirrors/radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2025-04-24 06:27:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Aphrodite merged health check

Browse source
This commit is contained in:
Qstick 2020-09-25 22:27:14 -04:00
parent dbaccc5f91
commit 72062704ff
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs
View file

@ -34,7 +34,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
}
[TestCase("develop")]
[TestCase("nightly")]
[TestCase("v0.2")]
public void should_return_error_when_branch_is_v1(string branch)
{
GivenValidBranch(branch);
@ -42,8 +42,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
Subject.Check().ShouldBeError();
}
[TestCase("aphrodite")]
[TestCase("Aphrodite")]
[TestCase("nightly")]
[TestCase("Nightly")]
public void should_return_no_warning_when_branch_valid(string branch)
{
GivenValidBranch(branch);

9
src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs
View file

@ -23,11 +23,16 @@ namespace NzbDrone.Core.HealthCheck.Checks
if (!Enum.GetNames(typeof(ReleaseBranches)).Any(x => x.ToLower() == currentBranch))
{
if (currentBranch == "develop" || currentBranch == "nightly")
if (currentBranch == "develop" || currentBranch == "v0.2")
{
return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckPreviousVersionMessage"), _configFileService.Branch), "#branch-is-for-a-previous-version");
}
if (currentBranch == "aphrodite")
{
return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Branch 'aphrodite' has been merged, switch to 'nightly' for further V3 development", _configFileService.Branch), "#branch-is-for-a-previous-version");
}
return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckOfficialBranchMessage"), _configFileService.Branch), "#branch-is-not-a-valid-release-branch");
}
@ -36,7 +41,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
public enum ReleaseBranches
{
Aphrodite
Nightly
}
}
}

2
src/NzbDrone.Core/Localization/Core/en.json
View file

@ -564,7 +564,7 @@
"RejectionCount": "Rejection Count",
"RelativePath": "Relative Path",
"ReleaseBranchCheckOfficialBranchMessage": "Branch {0} is not a valid Radarr release branch, you will not receive updates",
"ReleaseBranchCheckPreviousVersionMessage": "Branch {0} is for a previous version of Radarr, set branch to 'Aphrodite' for further updates",
"ReleaseBranchCheckPreviousVersionMessage": "Branch {0} is for a previous version of Radarr, set branch to 'Nightly' for further updates",
"ReleaseDates": "Release Dates",
"ReleaseGroup": "Release Group",
"ReleaseRejected": "Release Rejected",