From 31cb5fe523b1f92855f3ff6a56552a40df568632 Mon Sep 17 00:00:00 2001 From: Qstick Date: Mon, 9 Sep 2019 08:06:49 -0400 Subject: [PATCH] Changed: Version Bump 0.7.0 (#952) --- azure-pipelines.yml | 14 ++++++++++++-- .../Instrumentation/NzbDroneLogger.cs | 2 +- .../Configuration/ConfigFileProvider.cs | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 56334c8f3..10050f68d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ variables: outputFolder: './_output' artifactsFolder: './_artifacts' testsFolder: './_tests' - majorVersion: '0.6.2' + majorVersion: '0.7.0' minorVersion: $[counter('minorVersion', 1076)] lidarrVersion: '$(majorVersion).$(minorVersion)' buildName: '$(Build.SourceBranchName).$(lidarrVersion)' @@ -22,6 +22,7 @@ trigger: branches: include: - develop + - master pr: - develop @@ -202,9 +203,18 @@ stages: sentry-cli releases new --finalize -p lidarr -p lidarr-ui -p lidarr-update "${RELEASENAME}" sentry-cli releases -p lidarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite sentry-cli releases set-commits --auto "${RELEASENAME}" + if [[ ${BUILD_SOURCEBRANCHNAME} == "refs/heads/develop" ]]; then sentry-cli releases deploys "${RELEASENAME}" new -e nightly + else + sentry-cli releases deploys "${RELEASENAME}" new -e production + fi displayName: Publish Sentry Source Maps - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) + condition: | + or + ( + and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')), + and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + ) env: SENTRY_AUTH_TOKEN: $(sentryAuthToken) SENTRY_ORG: $(sentryOrg) diff --git a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs index ac9982a9e..489d16a3b 100644 --- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs +++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs @@ -73,7 +73,7 @@ namespace NzbDrone.Common.Instrumentation else { dsn = RuntimeInfo.IsProduction - ? "https://daa808e34499445fb49a0da1d38bcbbe@sentry.io/209545" + ? "https://f607fb34f89745f9bfe5ded0a97ab00a@sentry.io/209545" : "https://28faaa7023384031b29e38d3be74fa11@sentry.io/227247"; } diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs index 9cb37f2f7..6f054f4c9 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); - public string Branch => GetValue("Branch", "develop").ToLowerInvariant(); + public string Branch => GetValue("Branch", "master").ToLowerInvariant(); public string LogLevel => GetValue("LogLevel", "info"); public string ConsoleLogLevel => GetValue("ConsoleLogLevel", string.Empty, persist: false);