mirror of https://github.com/Radarr/Radarr
Default Branch to Master
This commit is contained in:
parent
23a8b68869
commit
3d5d884505
|
@ -25,24 +25,20 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
|
|||
.Returns(branch);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void should_return_warning_when_branch_not_valid()
|
||||
[TestCase("aphrodite")]
|
||||
[TestCase("qbit-fix")]
|
||||
[TestCase("phantom")]
|
||||
public void should_return_warning_when_branch_is_not_valid(string branch)
|
||||
{
|
||||
GivenValidBranch("master");
|
||||
GivenValidBranch(branch);
|
||||
|
||||
Subject.Check().ShouldBeWarning();
|
||||
}
|
||||
|
||||
[TestCase("develop")]
|
||||
public void should_return_error_when_branch_is_v1(string branch)
|
||||
{
|
||||
GivenValidBranch(branch);
|
||||
|
||||
Subject.Check().ShouldBeError();
|
||||
}
|
||||
|
||||
[TestCase("nightly")]
|
||||
[TestCase("Nightly")]
|
||||
[TestCase("develop")]
|
||||
[TestCase("master")]
|
||||
public void should_return_no_warning_when_branch_valid(string branch)
|
||||
{
|
||||
GivenValidBranch(branch);
|
||||
|
|
|
@ -178,7 +178,7 @@ namespace NzbDrone.Core.Configuration
|
|||
public bool AnalyticsEnabled => GetValueBoolean("AnalyticsEnabled", true, persist: false);
|
||||
|
||||
// TODO: Change back to "master" for the first stable release.
|
||||
public string Branch => GetValue("Branch", "nightly").ToLowerInvariant();
|
||||
public string Branch => GetValue("Branch", "master").ToLowerInvariant();
|
||||
|
||||
public string LogLevel => GetValue("LogLevel", "info").ToLowerInvariant();
|
||||
public string ConsoleLogLevel => GetValue("ConsoleLogLevel", string.Empty, persist: false);
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace NzbDrone.Core.Configuration
|
|||
var releaseInfoPath = Path.Combine(bin, "release_info");
|
||||
|
||||
PackageUpdateMechanism = UpdateMechanism.BuiltIn;
|
||||
DefaultBranch = "nightly";
|
||||
DefaultBranch = "master";
|
||||
|
||||
if (Path.GetFileName(bin) == "bin" && diskProvider.FileExists(packageInfoPath))
|
||||
{
|
||||
|
|
|
@ -23,11 +23,6 @@ namespace NzbDrone.Core.HealthCheck.Checks
|
|||
|
||||
if (!Enum.GetNames(typeof(ReleaseBranches)).Any(x => x.ToLower() == currentBranch))
|
||||
{
|
||||
if (currentBranch == "develop")
|
||||
{
|
||||
return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckPreviousVersionMessage"), _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,6 +31,8 @@ namespace NzbDrone.Core.HealthCheck.Checks
|
|||
|
||||
public enum ReleaseBranches
|
||||
{
|
||||
Master,
|
||||
Develop,
|
||||
Nightly
|
||||
}
|
||||
}
|
||||
|
|
|
@ -732,7 +732,6 @@
|
|||
"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 'Nightly' for further updates",
|
||||
"Released": "Released",
|
||||
"ReleaseDates": "Release Dates",
|
||||
"ReleasedMsg": "Movie is released",
|
||||
|
|
Loading…
Reference in New Issue