ci: Split build binaries stage to UWP and WinUI stages

ramezgerges · Jan 22, 2024 · a39fd6b · a39fd6b
1 parent 2770c88
commit a39fd6b
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 54 deletions.
diff --git a/build/ci/.azure-devops-package-netcoremobile.yml b/build/ci/.azure-devops-package-netcoremobile.yml
@@ -1,5 +1,7 @@
 parameters:
   poolName: ''
+  UNO_UWP_BUILD: ''
+  XAML_FLAVOR_BUILD: ''
 
 jobs:
 - job: netcoremobile_win_build
@@ -10,28 +12,11 @@ jobs:
 
   strategy:
     matrix:
-      UWP_NET8:
-        UNO_UWP_BUILD: true
-        XAML_FLAVOR_BUILD: UWP
+      NET8:
         UnoDisableNet7Mobile: true
         ZipFileTargetFramework: net8
 
-      WinUI_NET8:
-        UNO_UWP_BUILD: false
-        XAML_FLAVOR_BUILD: WinUI
-        UnoDisableNet7Mobile: true
-        ZipFileTargetFramework: net8
-
-      UWP_NET7:
-        UNO_UWP_BUILD: true
-        XAML_FLAVOR_BUILD: UWP
-        UnoDisableNetCurrentMobile: true
-        UnoDisableNetCurrent: true
-        ZipFileTargetFramework: net7
-
-      WinUI_NET7:
-        UNO_UWP_BUILD: false
-        XAML_FLAVOR_BUILD: WinUI
+      NET7:
         UnoDisableNetCurrentMobile: true
         UnoDisableNetCurrent: true
         ZipFileTargetFramework: net7
@@ -49,6 +34,9 @@ jobs:
     # Use pre-defined local nuget cache for restore
     NUGET_PACKAGES: 'C:\NugetPackages'
 
+    UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
+    XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
+
   steps:
   - checkout: self
     clean: true

diff --git a/build/ci/.azure-devops-package-reference.yml b/build/ci/.azure-devops-package-reference.yml
@@ -1,27 +1,22 @@
 parameters:
   poolName: ''
+  UNO_UWP_BUILD: ''
+  XAML_FLAVOR_BUILD: ''
 
 jobs:
 - job: reference_package_build
   displayName: 'Reference Package Binaries'
 
   pool: ${{ parameters.poolName }}
 
-  strategy:
-    matrix:
-      UWP:
-        UNO_UWP_BUILD: true
-        XAML_FLAVOR_BUILD: UWP
-
-      WinUI:
-        UNO_UWP_BUILD: false
-        XAML_FLAVOR_BUILD: WinUI
-
   variables:
     CombinedConfiguration: Release|Any CPU
     CI_Build: true
     NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
 
+    UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
+    XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
+
   steps:
   - checkout: self
     clean: true

diff --git a/build/ci/.azure-devops-package-skia.yml b/build/ci/.azure-devops-package-skia.yml
@@ -1,5 +1,7 @@
 parameters:
   poolName: ''
+  UNO_UWP_BUILD: ''
+  XAML_FLAVOR_BUILD: ''
 
 jobs:
 - job: skia_package_build
@@ -8,16 +10,6 @@ jobs:
 
   pool: ${{ parameters.poolName }}
 
-  strategy:
-    matrix:
-      UWP:
-        UNO_UWP_BUILD: true
-        XAML_FLAVOR_BUILD: UWP
-
-      WinUI:
-        UNO_UWP_BUILD: false
-        XAML_FLAVOR_BUILD: WinUI
-
   variables:
     CombinedConfiguration: Release|Any CPU
     CI_Build: true
@@ -27,6 +19,9 @@ jobs:
     # We're building packages on linux, so we need to enable WPF support
     EnableWindowsTargeting: true
 
+    UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
+    XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
+
   steps:
   - checkout: self
     clean: true

diff --git a/build/ci/.azure-devops-package-wasm.yml b/build/ci/.azure-devops-package-wasm.yml
@@ -1,22 +1,14 @@
 parameters:
   poolName: ''
+  UNO_UWP_BUILD: ''
+  XAML_FLAVOR_BUILD: ''
 
 jobs:
 - job: wasm_package_build
   displayName: 'WebAssembly Package Binaries'
 
   pool: ${{ parameters.poolName }}
 
-  strategy:
-    matrix:
-      UWP:
-        UNO_UWP_BUILD: true
-        XAML_FLAVOR_BUILD: UWP
-
-      WinUI:
-        UNO_UWP_BUILD: false
-        XAML_FLAVOR_BUILD: WinUI
-
   variables:
     CombinedConfiguration: Release|Any CPU
     CI_Build: true
@@ -26,6 +18,9 @@ jobs:
     # Disabled until the wasm bootstrap can be updated to .NET 8 Pre 3 or later
     UnoDisableNetCurrentMobile: true
 
+    UNO_UWP_BUILD: ${{ parameters.UNO_UWP_BUILD }}
+    XAML_FLAVOR_BUILD: ${{ parameters.XAML_FLAVOR_BUILD }}
+
   steps:
   - checkout: self
     clean: true

diff --git a/build/ci/.azure-devops-stages.yml b/build/ci/.azure-devops-stages.yml
@@ -28,8 +28,8 @@ stages:
     parameters:
       poolName: '$(windowsScaledPool)'
 
-- stage: binaries_build
-  displayName: Build Binaries
+- stage: binaries_build_uwp
+  displayName: Build Binaries UWP
   dependsOn:
     - Setup
     - convert_tree
@@ -38,23 +38,62 @@ stages:
   - template: .azure-devops-package-netcoremobile.yml
     parameters:
       poolName: '$(windowsScaledPool)'
+      UNO_UWP_BUILD: true
+      XAML_FLAVOR_BUILD: UWP
 
   - template: .azure-devops-package-wasm.yml
     parameters:
       poolName: '$(linuxScaledPool)'
+      UNO_UWP_BUILD: true
+      XAML_FLAVOR_BUILD: UWP
+
+  - template: .azure-devops-package-reference.yml
+    parameters:
+      poolName: '$(linuxScaledPool)'
+      UNO_UWP_BUILD: true
+      XAML_FLAVOR_BUILD: UWP
+
+  - template: .azure-devops-package-skia.yml
+    parameters:
+      poolName: '$(linuxScaledPool)'
+      UNO_UWP_BUILD: true
+      XAML_FLAVOR_BUILD: UWP
+
+- stage: binaries_build_winui
+  displayName: Build Binaries WinUI
+  dependsOn:
+    - Setup
+
+  jobs: 
+  - template: .azure-devops-package-netcoremobile.yml
+    parameters:
+      poolName: '$(windowsScaledPool)'
+      UNO_UWP_BUILD: false
+      XAML_FLAVOR_BUILD: WinUI
 
+  - template: .azure-devops-package-wasm.yml
+    parameters:
+      poolName: '$(linuxScaledPool)'
+      UNO_UWP_BUILD: false
+      XAML_FLAVOR_BUILD: WinUI
+
   - template: .azure-devops-package-reference.yml
     parameters:
       poolName: '$(linuxScaledPool)'
-
+      UNO_UWP_BUILD: false
+      XAML_FLAVOR_BUILD: WinUI
+
   - template: .azure-devops-package-skia.yml
     parameters:
       poolName: '$(linuxScaledPool)'
+      UNO_UWP_BUILD: false
+      XAML_FLAVOR_BUILD: WinUI
 
 - stage: packages_build
   displayName: Generate Packages
   dependsOn:
-    - binaries_build
+    - binaries_build_uwp
+    - binaries_build_winui
 
   jobs: 
   - template: .azure-devops-package.yml
@@ -70,7 +109,8 @@ stages:
 - stage: unit_tests
   displayName: Tests - Unit
   dependsOn:
-    - binaries_build
+    - binaries_build_uwp
+    - binaries_build_winui
     - convert_tree
 
   jobs: