From 0a048d9231682df749b1b420909cb63183dfbda1 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:38:14 +0100 Subject: [PATCH] Update nightly build (#15359) * cherry-pick templateParameters from v14/dev * add isNightly parameter * remove v9 * add parameter check for myget isNightly --- build/azure-pipelines.yml | 19 +++++++++++++++---- build/nightly-build-trigger.yml | 6 +++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 7b543b201a..c3bac382da 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -41,11 +41,15 @@ parameters: displayName: TestFilter used for release type builds on non windows agents type: string default: ' ' + - name: isNightly + displayName: 'Is nightly build (used for MyGet feed)' + type: boolean + default: false variables: nodeVersion: 20 - dotnetVersion: 8.x - dotnetIncludePreviewVersions: true + dotnetVersion: 6.x + dotnetIncludePreviewVersions: false solution: umbraco.sln buildConfiguration: Release UMBRACO__CMS__GLOBAL__ID: 00000000-0000-0000-0000-000000000042 @@ -107,6 +111,7 @@ stages: displayName: Use .NET $(dotnetVersion) inputs: version: $(dotnetVersion) + performMultiLevelLookup: true includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet restore @@ -154,7 +159,7 @@ stages: inputs: targetType: inline script: | - dotnet tool install -g docfx --version 2.72.1 + choco install docfx --version=2.59.4 -y if ($lastexitcode -ne 0){ throw ("Error installing DocFX") } @@ -254,6 +259,7 @@ stages: displayName: Use .NET $(dotnetVersion) inputs: version: $(dotnetVersion) + performMultiLevelLookup: true includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet test @@ -292,6 +298,7 @@ stages: displayName: Use .NET $(dotnetVersion) inputs: version: $(dotnetVersion) + performMultiLevelLookup: true includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet test Windows @@ -467,6 +474,7 @@ stages: displayName: Use .NET $(dotnetVersion) inputs: version: $(dotnetVersion) + performMultiLevelLookup: true includePreviewVersions: $(dotnetIncludePreviewVersions) - pwsh: | $sha = 'g$(Build.SourceVersion)'.substring(0, 8) @@ -559,7 +567,10 @@ stages: command: 'push' packagesToPush: $(Build.ArtifactStagingDirectory)/**/*.nupkg nuGetFeedType: 'external' - publishFeedCredentials: 'MyGet - Pre-releases' + ${{ if eq(parameters.isNightly, true) }}: + publishFeedCredentials: 'MyGet - Umbraco Nightly' + ${{ else }}: + publishFeedCredentials: 'MyGet - Pre-releases' - stage: Deploy_NuGet displayName: NuGet release dependsOn: diff --git a/build/nightly-build-trigger.yml b/build/nightly-build-trigger.yml index 1b70e6c9e5..7e128b2af7 100644 --- a/build/nightly-build-trigger.yml +++ b/build/nightly-build-trigger.yml @@ -8,13 +8,13 @@ schedules: displayName: Daily midnight build branches: include: - - v9/dev - v10/dev - v12/dev - v13/dev - v14/dev steps: +- checkout: none - task: TriggerBuild@4 inputs: definitionIsInCurrentTeamProject: true @@ -26,10 +26,10 @@ steps: useSameBranch: true waitForQueuedBuildsToFinish: false storeInEnvironmentVariable: false - templateParameters: 'sqlServerIntegrationTests: true, forceReleaseTestFilter: true' + templateParameters: 'sqlServerIntegrationTests: true, forceReleaseTestFilter: true, myGetDeploy: true, isNightly: true' authenticationMethod: 'OAuth Token' enableBuildInQueueCondition: false dependentOnSuccessfulBuildCondition: false dependentOnFailedBuildCondition: false checkbuildsoncurrentbranch: false - failTaskIfConditionsAreNotFulfilled: false \ No newline at end of file + failTaskIfConditionsAreNotFulfilled: false