diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7f2dcb00f..ede959770 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,11 +20,10 @@ trigger: branches: include: - develop - - aphrodite + - master pr: - develop -- aphrodite stages: - stage: Setup @@ -40,7 +39,7 @@ stages: displayName: Set Build Name - bash: | if [[ $BUILD_REASON == "PullRequest" ]]; then - git diff origin/aphrodite...HEAD --name-only | grep -E "^(src/|azure-pipelines.yml)" + git diff origin/develop...HEAD --name-only | grep -E "^(src/|azure-pipelines.yml)" echo $? > not_backend_update else echo 0 > not_backend_update @@ -302,14 +301,22 @@ stages: sentry-cli releases new --finalize -p radarr -p radarr-ui -p radarr-update "${RELEASENAME}" sentry-cli releases -p radarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite sentry-cli releases set-commits --auto "${RELEASENAME}" - sentry-cli releases deploys "${RELEASENAME}" new -e aphrodite + if [[ ${BUILD_SOURCEBRANCH} == "refs/heads/develop" ]]; then + sentry-cli releases deploys "${RELEASENAME}" new -e nightly + else + sentry-cli releases deploys "${RELEASENAME}" new -e production + fi if [ $? -gt 0 ]; then echo "##vso[task.logissue type=warning]Error uploading source maps." fi exit 0 displayName: Publish Sentry Source Maps - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/aphrodite')) + condition: | + or + ( + and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')), + and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + ) env: SENTRY_AUTH_TOKEN: $(sentryAuthTokenServarr) SENTRY_ORG: $(sentryOrg) diff --git a/frontend/src/Components/Loading/LoadingMessage.js b/frontend/src/Components/Loading/LoadingMessage.js index d3649b41a..3c9d7a738 100644 --- a/frontend/src/Components/Loading/LoadingMessage.js +++ b/frontend/src/Components/Loading/LoadingMessage.js @@ -2,8 +2,24 @@ import React from 'react'; import styles from './LoadingMessage.css'; const messages = [ - 'Welcome to Radarr Aphrodite Preview. Enjoy' - // TODO Add some messages here + 'Downloading more RAM', + 'Now in Technicolor', + 'Previously on Radarr...', + 'Bleep Bloop.', + 'Locating the required gigapixels to render...', + 'Spinning up the hamster wheel...', + 'At least you\'re not on hold', + 'Hum something loud while others stare', + 'Loading humorous message... Please Wait', + 'I could\'ve been faster in Python', + 'Don\'t forget to rewind your tracks', + 'Congratulations! you are the 1000th visitor.', + 'HELP! I\'m being held hostage and forced to write these stupid lines!', + 'RE-calibrating the internet...', + 'I\'ll be here all week', + 'Don\'t forget to tip your waitress', + 'Apply directly to the forehead', + 'Loading Battlestation' ]; let message = null; diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs index 0cbb0a832..28e002987 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs @@ -34,7 +34,6 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks } [TestCase("develop")] - [TestCase("nightly")] public void should_return_error_when_branch_is_v1(string branch) { GivenValidBranch(branch); @@ -42,8 +41,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); diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs index 39eebfa16..07624eb3d 100644 --- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs +++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs @@ -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", "aphrodite").ToLowerInvariant(); + public string Branch => GetValue("Branch", "nightly").ToLowerInvariant(); public string LogLevel => GetValue("LogLevel", "info").ToLowerInvariant(); public string ConsoleLogLevel => GetValue("ConsoleLogLevel", string.Empty, persist: false); diff --git a/src/NzbDrone.Core/Configuration/DeploymentInfoProvider.cs b/src/NzbDrone.Core/Configuration/DeploymentInfoProvider.cs index bb11ec3ff..3fbeb126c 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 = "aphrodite"; + DefaultBranch = "nightly"; 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 b1de1b4d7..eca2d1fe1 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs @@ -23,7 +23,7 @@ namespace NzbDrone.Core.HealthCheck.Checks if (!Enum.GetNames(typeof(ReleaseBranches)).Any(x => x.ToLower() == currentBranch)) { - if (currentBranch == "develop" || currentBranch == "nightly") + if (currentBranch == "develop") { return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckPreviousVersionMessage"), _configFileService.Branch), "#branch-is-for-a-previous-version"); } @@ -36,7 +36,7 @@ namespace NzbDrone.Core.HealthCheck.Checks public enum ReleaseBranches { - Aphrodite + Nightly } } } diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 77544fe49..19e8a3dcb 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -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", diff --git a/src/NzbDrone.Core/Notifications/Discord/Discord.cs b/src/NzbDrone.Core/Notifications/Discord/Discord.cs index f61c970bc..4e00309a8 100644 --- a/src/NzbDrone.Core/Notifications/Discord/Discord.cs +++ b/src/NzbDrone.Core/Notifications/Discord/Discord.cs @@ -30,7 +30,7 @@ namespace NzbDrone.Core.Notifications.Discord Author = new DiscordAuthor { Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, - IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/aphrodite/Logo/256.png" + IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Url = $"https://www.themoviedb.org/movie/{message.Movie.TmdbId}", Description = "Movie Grabbed", @@ -117,7 +117,7 @@ namespace NzbDrone.Core.Notifications.Discord Author = new DiscordAuthor { Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, - IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/aphrodite/Logo/256.png" + IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Url = $"https://www.themoviedb.org/movie/{message.Movie.TmdbId}", Description = isUpgrade ? "Movie Upgraded" : "Movie Imported", @@ -221,7 +221,7 @@ namespace NzbDrone.Core.Notifications.Discord Author = new DiscordAuthor { Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, - IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/aphrodite/Logo/256.png" + IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Title = healthCheck.Source.Name, Description = healthCheck.Message, diff --git a/src/Radarr.Api.V3/swagger.json b/src/Radarr.Api.V3/swagger.json index 5d1097265..7fc3f07d7 100644 --- a/src/Radarr.Api.V3/swagger.json +++ b/src/Radarr.Api.V3/swagger.json @@ -674,7 +674,7 @@ "isWindows": true, "isDocker": false, "mode": "console", - "branch": "aphrodite", + "branch": "nightly", "authentication": "none", "sqliteVersion": "3.32.1", "migrationVersion": 180, @@ -868,9 +868,9 @@ "Example": { "value": { "version": "3.0.0.3553", - "branch": "aphrodite", + "branch": "nightly", "releaseDate": "2020-09-02T05:36:13.047313Z", - "fileName": "Radarr.aphrodite.3.0.0.3553.windows-core-x64.zip", + "fileName": "Radarr.nightly.3.0.0.3553.windows-core-x64.zip", "url": "https://dev.azure.com/Radarr/Radarr/_apis/build/builds/1896/artifacts?artifactName=Packages&fileId=A710686A9CB6848E73C3DDCA5F2B0D83C6189546E66DD3EF2D0D30B20735F6E802&fileName=Radarr.aphrodite.3.0.0.3553.windows-core-x64.zip&api-version=5.1", "installed": false, "installable": false,