Merge pull request #1766 from qdraw/feature/202410_ado_update

update ubuntu version to latest
qdraw · Oct 11, 2024 · 7e3ec73 · 7e3ec73
2 parents 71e3e29 + b995c36
commit 7e3ec73
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/pipelines/azure/app-ci.yml b/pipelines/azure/app-ci.yml
@@ -44,7 +44,7 @@ stages:
   - job: buildnetcore
     displayName: 'Build .NET Core'
     pool:
-      vmImage: 'ubuntu-22.04'
+      vmImage: 'ubuntu-24.04'
 
     steps:
     - checkout: self
@@ -90,8 +90,8 @@ stages:
   - job: build
     displayName: 'Build Electron'
     pool:
-      vmImage: 'ubuntu-22.04'
-    container: electronuserland/builder:18-wine
+      vmImage: 'ubuntu-24.04'
+    container: electronuserland/builder:20-wine
     steps:
     - task: DownloadPipelineArtifact@2
       inputs:

diff --git a/pipelines/azure/develop-ci.yml b/pipelines/azure/develop-ci.yml
@@ -61,7 +61,7 @@ stages:
     timeoutInMinutes: 35 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 10 # how much time to give 'run always even if cancelled tasks' before stopping them
     pool:
-      vmImage: 'ubuntu-22.04'
+      vmImage: 'ubuntu-24.04'
       demands:
       - msbuild
       - java

diff --git a/pipelines/azure/documentation.yaml b/pipelines/azure/documentation.yaml
@@ -43,7 +43,7 @@ stages:
     timeoutInMinutes: 10 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 2 # how much time to give 'run always even if cancelled tasks' before stopping them
     pool:
-      vmImage: 'ubuntu-22.04'
+      vmImage: 'ubuntu-24.04'
 
     steps:
     - checkout: self

diff --git a/pipelines/azure/nightly-ci.yml b/pipelines/azure/nightly-ci.yml
@@ -2,7 +2,7 @@ trigger: none
 pr: none
 
 pool:
-  vmImage: ubuntu-22.04
+  vmImage: ubuntu-24.04
   demands:
   - npm
 

diff --git a/pipelines/azure/shared-web-only.yml b/pipelines/azure/shared-web-only.yml
@@ -43,7 +43,7 @@ pr:
     - master
 
 pool:
-  vmImage: 'ubuntu-22.04'
+  vmImage: 'ubuntu-24.04'
 
 steps:
 - checkout: self
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ pr: @@
         - master
     pool:
-      vmImage: 'ubuntu-22.04'
+      vmImage: 'ubuntu-24.04'
     steps:
     - checkout: self
@@ Expand Down @@