From c8cdf03077a5d382f3db4fab44332a4ca2e705f2 Mon Sep 17 00:00:00 2001 From: ta264 Date: Thu, 20 Jan 2022 21:40:40 +0000 Subject: [PATCH] Centralise image choice, update to latest images Fixes #6957 (cherry picked from commit fa1985509d77dedd108286a159749fd5cf9d8599) --- azure-pipelines.yml | 64 ++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index afb78a389..6c99b022e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,6 +7,8 @@ variables: outputFolder: './_output' artifactsFolder: './_artifacts' testsFolder: './_tests' + yarnCacheFolder: $(Pipeline.Workspace)/.yarn + nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages majorVersion: '4.1.0' minorVersion: $[counter('minorVersion', 2000)] radarrVersion: '$(majorVersion).$(minorVersion)' @@ -16,7 +18,9 @@ variables: dotnetVersion: '6.0.201' nodeVersion: '16.X' innoVersion: '6.2.0' - yarnCacheFolder: $(Pipeline.Workspace)/.yarn + windowsImage: 'windows-2022' + linuxImage: 'ubuntu-20.04' + macImage: 'macOS-11' trigger: branches: @@ -40,7 +44,7 @@ stages: - job: displayName: Build Variables pool: - vmImage: 'ubuntu-18.04' + vmImage: ${{ variables.linuxImage }} steps: # Set the build name properly. The 'name' property won't recursively expand so hack here: - bash: echo "##vso[build.updatebuildnumber]$RADARRVERSION" @@ -66,15 +70,15 @@ stages: matrix: Linux: osName: 'Linux' - imageName: 'ubuntu-18.04' + imageName: ${{ variables.linuxImage }} enableAnalysis: 'true' Mac: osName: 'Mac' - imageName: 'macos-10.15' + imageName: ${{ variables.macImage }} enableAnalysis: 'false' Windows: osName: 'Windows' - imageName: 'windows-2019' + imageName: ${{ variables.windowsImage }} enableAnalysis: 'false' pool: @@ -144,13 +148,13 @@ stages: matrix: Linux: osName: 'Linux' - imageName: 'ubuntu-18.04' + imageName: ${{ variables.linuxImage }} Mac: osName: 'Mac' - imageName: 'macos-10.15' + imageName: ${{ variables.macImage }} Windows: osName: 'Windows' - imageName: 'windows-2019' + imageName: ${{ variables.windowsImage }} pool: vmImage: $(imageName) steps: @@ -187,7 +191,7 @@ stages: - job: Windows_Installer displayName: Create Installer pool: - vmImage: 'windows-2019' + vmImage: ${{ variables.windowsImage }} steps: - checkout: self fetchDepth: 1 @@ -220,7 +224,7 @@ stages: - job: Other_Packages displayName: Create Standard Packages pool: - vmImage: 'ubuntu-18.04' + vmImage: ${{ variables.linuxImage }} steps: - checkout: self fetchDepth: 1 @@ -381,7 +385,7 @@ stages: jobs: - job: Prepare pool: - vmImage: 'ubuntu-18.04' + vmImage: ${{ variables.linuxImage }} steps: - checkout: none - task: DownloadPipelineArtifact@2 @@ -405,17 +409,17 @@ stages: osName: 'Mac' testName: 'MacCore' poolName: 'Azure Pipelines' - imageName: 'macos-10.15' + imageName: ${{ variables.macImage }} WindowsCore: osName: 'Windows' testName: 'WindowsCore' poolName: 'Azure Pipelines' - imageName: 'windows-2019' + imageName: ${{ variables.windowsImage }} LinuxCore: osName: 'Linux' testName: 'LinuxCore' poolName: 'Azure Pipelines' - imageName: 'ubuntu-18.04' + imageName: ${{ variables.linuxImage }} FreebsdCore: osName: 'Linux' testName: 'FreebsdCore' @@ -475,7 +479,7 @@ stages: containerImage: ghcr.io/servarr/testimages:alpine pool: - vmImage: 'ubuntu-18.04' + vmImage: ${{ variables.linuxImage }} container: $[ variables['containerImage'] ] @@ -519,7 +523,7 @@ stages: jobs: - job: Prepare pool: - vmImage: 'ubuntu-18.04' + vmImage: ${{ variables.linuxImage }} steps: - checkout: none - task: DownloadPipelineArtifact@2 @@ -539,17 +543,17 @@ stages: MacCore: osName: 'Mac' testName: 'MacCore' - imageName: 'macos-10.15' + imageName: ${{ variables.macImage }} pattern: 'Radarr.*.osx-core-x64.tar.gz' WindowsCore: osName: 'Windows' testName: 'WindowsCore' - imageName: 'windows-2019' + imageName: ${{ variables.windowsImage }} pattern: 'Radarr.*.windows-core-x64.zip' LinuxCore: osName: 'Linux' testName: 'LinuxCore' - imageName: 'ubuntu-18.04' + imageName: ${{ variables.linuxImage }} pattern: 'Radarr.*.linux-core-x64.tar.gz' pool: @@ -653,7 +657,7 @@ stages: containerImage: ghcr.io/servarr/testimages:alpine pattern: 'Radarr.*.linux-musl-core-x64.tar.gz' pool: - vmImage: 'ubuntu-18.04' + vmImage: ${{ variables.linuxImage }} container: $[ variables['containerImage'] ] @@ -709,17 +713,17 @@ stages: matrix: Linux: osName: 'Linux' - imageName: 'ubuntu-18.04' + imageName: ${{ variables.linuxImage }} pattern: 'Radarr.*.linux-core-x64.tar.gz' failBuild: true Mac: osName: 'Mac' - imageName: 'macos-10.15' + imageName: ${{ variables.macImage }} pattern: 'Radarr.*.osx-core-x64.tar.gz' failBuild: true Windows: osName: 'Windows' - imageName: 'windows-2019' + imageName: ${{ variables.windowsImage }} pattern: 'Radarr.*.windows-core-x64.zip' failBuild: true @@ -785,7 +789,7 @@ stages: jobs: - job: Prepare pool: - vmImage: 'ubuntu-18.04' + vmImage: ${{ variables.linuxImage }} steps: - checkout: none - task: DownloadPipelineArtifact@2 @@ -802,10 +806,10 @@ stages: matrix: Linux: osName: 'Linux' - imageName: 'ubuntu-18.04' + imageName: ${{ variables.linuxImage }} Windows: osName: 'Windows' - imageName: 'windows-2019' + imageName: ${{ variables.windowsImage }} pool: vmImage: $(imageName) steps: @@ -834,7 +838,7 @@ stages: displayName: Frontend condition: eq(variables['System.PullRequest.IsFork'], 'False') pool: - vmImage: windows-2019 + vmImage: ${{ variables.windowsImage }} steps: - checkout: self # Need history for Sonar analysis - task: SonarCloudPrepare@1 @@ -862,7 +866,7 @@ stages: ) pool: - vmImage: windows-2019 + vmImage: ${{ variables.windowsImage }} steps: - task: UseDotNet@2 @@ -915,7 +919,7 @@ stages: EnableAnalyzers: 'false' pool: - vmImage: windows-2019 + vmImage: ${{ variables.windowsImage }} steps: - task: UseDotNet@2 @@ -972,7 +976,7 @@ stages: - job: displayName: Discord Notification pool: - vmImage: 'ubuntu-18.04' + vmImage: ${{ variables.linuxImage }} steps: - task: DownloadPipelineArtifact@2 continueOnError: true