Split the pipeline up on release builds

scripts/Docker/debian/clang-cross/10/Dockerfile

@@ -52,7 +52,7 @@ RUN . /etc/skia-env \
     && mkdir -p /skia-utils/libfontconfig-dev \
     && cd /skia-utils/libfontconfig-dev \
     && case "${TOOLCHAIN_ARCH_SHORT}" in \
-         riscv64) FC_VERSION=2.15.0-2.2 ; FC_PKG=libfontconfig-dev  ;; \
+         riscv64) FC_VERSION=2.15.0-2.3 ; FC_PKG=libfontconfig-dev  ;; \
          *)       FC_VERSION=2.13.1-2   ; FC_PKG=libfontconfig1-dev ;; \
        esac \
     && curl http://deb.debian.org/debian/pool/main/f/fontconfig/${FC_PKG}_${FC_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb -L -o libfontconfig-dev.deb \

scripts/Docker/debian/clang-cross/12/Dockerfile

@@ -52,7 +52,7 @@ RUN . /etc/skia-env \
     && mkdir -p /skia-utils/libfontconfig-dev \
     && cd /skia-utils/libfontconfig-dev \
     && case "${TOOLCHAIN_ARCH_SHORT}" in \
-         riscv64) FC_VERSION=2.15.0-2.2 ; FC_PKG=libfontconfig-dev  ;; \
+         riscv64) FC_VERSION=2.15.0-2.3 ; FC_PKG=libfontconfig-dev  ;; \
          *)       FC_VERSION=2.13.1-2   ; FC_PKG=libfontconfig1-dev ;; \
        esac \
     && curl http://deb.debian.org/debian/pool/main/f/fontconfig/${FC_PKG}_${FC_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb -L -o libfontconfig-dev.deb \

scripts/Docker/debian/clang-cross/13/Dockerfile

@@ -58,7 +58,7 @@ RUN . /etc/skia-env \
     && APT_REPO=http://deb.debian.org/debian \
     && case "${TOOLCHAIN_ARCH_SHORT}" in \
          loong64) FC_VERSION=2.15.0-1.1 ; FC_PKG=libfontconfig-dev  ; APT_REPO=https://pkg.loongnix.cn/loongnix/25  ;; \
-         riscv64) FC_VERSION=2.15.0-2.2 ; FC_PKG=libfontconfig-dev  ;; \
+         riscv64) FC_VERSION=2.15.0-2.3 ; FC_PKG=libfontconfig-dev  ;; \
          *)       FC_VERSION=2.13.1-2   ; FC_PKG=libfontconfig1-dev ;; \
        esac \
     && curl ${APT_REPO}/pool/main/f/fontconfig/${FC_PKG}_${FC_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb -L -o libfontconfig-dev.deb \

scripts/azure-pipelines-complete-internal.yml

@@ -87,7 +87,7 @@ parameters:
     default: false
 
 variables:
-  - template: /scripts/azure-pipelines-variables.yml@self
+  - template: /scripts/azure-templates-variables.yml@self
 
 resources:
   repositories:
@@ -105,15 +105,15 @@ extends:
   ${{ if eq('${{ parameters.use1ESPipelineTemplates }}', 'true') }}:
     template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
   ${{ if ne('${{ parameters.use1ESPipelineTemplates }}', 'true') }}:
-    template: /scripts/azure-template.yml@self
+    template: /scripts/azure-template-fake-1es.yml@self
   parameters:
     pool: ${{ parameters.buildAgentHost.pool }}
     customBuildTags:
       - ES365AIMigrationTooling
     stages:
       - template: /scripts/azure-templates-stages.yml@self
         parameters:
-          buildPipelineType: 'both'
+          buildPipelineType: 'complete'
           buildExternals: ${{ parameters.buildExternals }}
           enableSigning: ${{ parameters.enableSigning }}
           ${{ if eq(parameters.runCompliance, 'true') }}:

scripts/azure-pipelines-complete.yml

@@ -81,16 +81,16 @@ parameters:
         installXcode: false
 
 variables:
-  - template: /scripts/azure-pipelines-variables.yml@self
+  - template: /scripts/azure-templates-variables.yml@self
 
 extends:
-  template: /scripts/azure-template.yml@self
+  template: /scripts/azure-template-fake-1es.yml@self
   parameters:
     pool: ${{ parameters.buildAgentHost.pool }}
     stages:
       - template: /scripts/azure-templates-stages.yml@self
         parameters:
-          buildPipelineType: 'both'
+          buildPipelineType: 'complete'
           buildExternals: ${{ parameters.buildExternals }}
           buildAgentHost: ${{ parameters.buildAgentHost }}
           buildAgentWindows: ${{ parameters.buildAgentWindows }}

scripts/azure-pipelines.yml → scripts/azure-pipelines-native.yml

@@ -1,12 +1,6 @@
-trigger:
-  - main
-  - develop
-  - release/*
+trigger: none
 
-pr:
-  - main
-  - develop
-  - release/*
+pr: none
 
 parameters:
   - name: buildExternals
@@ -21,14 +15,6 @@ parameters:
         name: Maui-1ESPT
         image: 1ESPT-Windows2022
         os: windows
-  - name: buildAgentWindows
-    displayName: 'The Windows build agent configuration:'
-    type: object
-    default:
-      pool:
-        name: Maui-1ESPT
-        image: 1ESPT-Windows2022
-        os: windows
   - name: buildAgentWindowsNative
     displayName: 'The Windows build agent configuration for building the native assets:'
     type: object
@@ -37,14 +23,6 @@ parameters:
         name: Maui-1ESPT
         image: 1ESPT-Windows2022
         os: windows
-  - name: buildAgentMac
-    displayName: 'The macOS build agent configuration:'
-    type: object
-    default:
-      pool:
-        name: Azure Pipelines
-        vmImage: macos-14
-        os: macos
   - name: buildAgentMacNative
     displayName: 'The macOS build agent configuration for building the native assets:'
     type: object
@@ -53,14 +31,6 @@ parameters:
         name: Azure Pipelines
         vmImage: macos-14
         os: macos
-  - name: buildAgentLinux
-    displayName: 'The Linux build agent configuration:'
-    type: object
-    default:
-      pool:
-        name: Maui-1ESPT
-        image: 1ESPT-Ubuntu22.04
-        os: linux
   - name: buildAgentLinuxNative
     displayName: 'The Linux build agent configuration for building the native assets:'
     type: object
@@ -73,13 +43,9 @@ parameters:
     displayName: 'Run post-build compliance tasks (such as API Scan and PoliCheck)'
     type: boolean
     default: false
-  - name: forceRealSigning
-    displayName: 'Ignore all logic and force Real signing on binaries'
-    type: boolean
-    default: false
 
 variables:
-  - template: /scripts/azure-pipelines-variables.yml@self
+  - template: /scripts/azure-templates-variables.yml@self
 
 resources:
   repositories:
@@ -102,11 +68,9 @@ extends:
     stages:
       - template: /scripts/azure-templates-stages.yml@self
         parameters:
-          buildPipelineType: 'build'
+          buildPipelineType: 'native'
           buildExternals: ${{ parameters.buildExternals }}
           ${{ if and(eq(variables['System.TeamProject'], 'devdiv'), ne(variables['System.PullRequest.IsFork'], 'true')) }}:
-            enableSigning: true
-            forceRealSigning: ${{ parameters.forceRealSigning }}
             ${{ if or(parameters.runCompliance, and(eq(variables['Build.Reason'], 'Schedule'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))) }}:
               sdl:
                 apiscan:
@@ -131,10 +95,6 @@ extends:
                   configFile: $(Build.SourcesDirectory)\scripts\guardian\tsaoptions-v2.json
           use1ESPipelineTemplates: true
           buildAgentHost: ${{ parameters.buildAgentHost }}
-          buildAgentWindows: ${{ parameters.buildAgentWindows }}
           buildAgentWindowsNative: ${{ parameters.buildAgentWindowsNative }}
-          buildAgentMac: ${{ parameters.buildAgentMac }}
           buildAgentMacNative: ${{ parameters.buildAgentMacNative }}
-          buildAgentLinux: ${{ parameters.buildAgentLinux }}
           buildAgentLinuxNative: ${{ parameters.buildAgentLinuxNative }}
-          buildAgentAndroidTests: ${{ parameters.buildAgentMac }}

scripts/azure-pipelines-package.yml

@@ -0,0 +1,105 @@
+trigger: none
+
+pr: none
+
+parameters:
+  - name: buildAgentHost
+    displayName: 'The generic host build agent configuration:'
+    type: object
+    default:
+      pool:
+        name: Maui-1ESPT
+        image: 1ESPT-Windows2022
+        os: windows
+  - name: buildAgentWindows
+    displayName: 'The Windows build agent configuration:'
+    type: object
+    default:
+      pool:
+        name: Maui-1ESPT
+        image: 1ESPT-Windows2022
+        os: windows
+  - name: buildAgentMac
+    displayName: 'The macOS build agent configuration:'
+    type: object
+    default:
+      pool:
+        name: Azure Pipelines
+        vmImage: macos-14
+        os: macos
+  - name: buildAgentLinux
+    displayName: 'The Linux build agent configuration:'
+    type: object
+    default:
+      pool:
+        name: Maui-1ESPT
+        image: 1ESPT-Ubuntu22.04
+        os: linux
+  - name: runCompliance
+    displayName: 'Run post-build compliance tasks (such as API Scan and PoliCheck)'
+    type: boolean
+    default: false
+  - name: forceRealSigning
+    displayName: 'Ignore all logic and force Real signing on binaries'
+    type: boolean
+    default: false
+
+variables:
+  - template: /scripts/azure-templates-variables.yml@self
+
+resources:
+  repositories:
+    - repository: xamarin-templates
+      type: github
+      name: xamarin/yaml-templates
+      endpoint: xamarin
+      ref: refs/heads/main
+    - repository: 1ESPipelineTemplates
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+  pipelines:
+    - pipeline: SkiaSharp
+      source: SkiaSharp-Native
+      trigger: true
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    pool: ${{ parameters.buildAgentHost.pool }}
+    customBuildTags:
+      - ES365AIMigrationTooling
+    stages:
+      - template: /scripts/azure-templates-stages.yml@self
+        parameters:
+          buildPipelineType: 'package'
+          ${{ if and(eq(variables['System.TeamProject'], 'devdiv'), ne(variables['System.PullRequest.IsFork'], 'true')) }}:
+            enableSigning: true
+            forceRealSigning: ${{ parameters.forceRealSigning }}
+            ${{ if or(parameters.runCompliance, and(eq(variables['Build.Reason'], 'Schedule'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))) }}:
+              sdl:
+                apiscan:
+                  enabled: true
+                binskim:
+                  enabled: true
+                  break: false
+                codeInspector:
+                  enabled: true
+                credscan:
+                  enabled: true
+                  # suppressionsFile: $(Build.SourcesDirectory)\scripts\guardian\CredScanSuppressions.json
+                policheck:
+                  enabled: true
+                  exclusionsFile: $(Build.SourcesDirectory)\scripts\guardian\PoliCheckExclusions.xml
+                spotBugs:
+                  enabled: false
+                suppression:
+                  suppressionFile: $(Build.SourcesDirectory)\scripts\guardian\source.gdnsuppress
+                tsa:
+                  enabled: true
+                  configFile: $(Build.SourcesDirectory)\scripts\guardian\tsaoptions-v2.json
+          use1ESPipelineTemplates: true
+          buildAgentHost: ${{ parameters.buildAgentHost }}
+          buildAgentWindows: ${{ parameters.buildAgentWindows }}
+          buildAgentMac: ${{ parameters.buildAgentMac }}
+          buildAgentLinux: ${{ parameters.buildAgentLinux }}

scripts/azure-pipelines-tests.yml

@@ -47,7 +47,7 @@ parameters:
         installXcode: false
 
 variables:
-  - template: /scripts/azure-pipelines-variables.yml@self
+  - template: /scripts/azure-templates-variables.yml@self
 
 resources:
   repositories:
@@ -62,18 +62,15 @@ resources:
       trigger: true
 
 extends:
-  template: /scripts/azure-template.yml@self
+  template: /scripts/azure-template-fake-1es.yml@self
   parameters:
     pool: ${{ parameters.buildAgentHost.pool }}
     stages:
       - template: /scripts/azure-templates-stages.yml@self
         parameters:
-          buildPipelineType: 'tests'
+          buildPipelineType: 'test'
           buildAgentHost: ${{ parameters.buildAgentHost }}
           buildAgentWindows: ${{ parameters.buildAgentWindows }}
-          buildAgentWindowsNative: ${{ parameters.buildAgentWindows }}
           buildAgentMac: ${{ parameters.buildAgentMac }}
-          buildAgentMacNative: ${{ parameters.buildAgentMac }}
           buildAgentLinux: ${{ parameters.buildAgentLinux }}
-          buildAgentLinuxNative: ${{ parameters.buildAgentLinux }}
           buildAgentAndroidTests: ${{ parameters.buildAgentAndroidTests }}