Small Refactor of Build Files (microsoft#407)

.azure/azure-pipelines-int.ci.yml

@@ -18,11 +18,63 @@ pr:
 
 name: 0.$(Date:yyyy).$(Date:MM).$(DayOfMonth).$(Rev:rr).0
 
+stages:
+
+#
+# Merge to Integration
+#
+
+- stage: integrate
+  displayName: Integrate Branch
+  dependsOn: []
+  condition: |
+    and
+    (
+      not(startsWith(variables['Build.SourceBranch'], 'refs/pull')),
+      not(startsWith(variables['Build.SourceBranch'], 'refs/heads/integration/'))
+    )
+  jobs:
+  - job: integrate
+    displayName: Integrate Branch
+    pool:
+      vmImage: windows-latest
+    variables:
+      runCodesignValidationInjection: false
+    steps:
+    - checkout: self
+      persistCredentials: true
+    - task: PowerShell@2
+      displayName: Integrate Branch
+      inputs:
+        filePath: .azure/scripts/integrate-branch.ps1
+        arguments: -Branch $(Build.SourceBranch)
+
 #
 # Builds
 #
 
-stages:
+- stage: build_winkernel
+  displayName: Build Windows Drivers
+  dependsOn: []
+  condition: |
+    or
+    (
+      startsWith(variables['Build.SourceBranch'], 'refs/pull'),
+      startsWith(variables['Build.SourceBranch'], 'refs/heads/integration/')
+    )
+  jobs:
+  - template: ./templates/build-config-winkernel.yml
+    parameters:
+      arch: x64
+  - template: ./templates/build-config-winkernel.yml
+    parameters:
+      arch: x86
+  - template: ./templates/build-config-winkernel.yml
+    parameters:
+      arch: arm
+  - template: ./templates/build-config-winkernel.yml
+    parameters:
+      arch: arm64
 
 - stage: build_windows
   displayName: Build Windows
@@ -59,29 +111,6 @@ stages:
       arch: arm64
       tls: schannel
 
-- stage: build_winkernel
-  displayName: Build Windows Drivers
-  dependsOn: []
-  condition: |
-    or
-    (
-      startsWith(variables['Build.SourceBranch'], 'refs/pull'),
-      startsWith(variables['Build.SourceBranch'], 'refs/heads/integration/')
-    )
-  jobs:
-  - template: ./templates/build-config-winkernel.yml
-    parameters:
-      arch: x64
-  - template: ./templates/build-config-winkernel.yml
-    parameters:
-      arch: x86
-  - template: ./templates/build-config-winkernel.yml
-    parameters:
-      arch: arm
-  - template: ./templates/build-config-winkernel.yml
-    parameters:
-      arch: arm64
-
 #
 # Build Verification Tests
 #
@@ -117,32 +146,3 @@ stages:
   condition: and(startsWith(variables['Build.SourceBranch'], 'refs/heads/integration/'), succeeded())
   jobs:
   - template: ./templates/create-package.yml
-
-#
-# Merge to Integration
-#
-
-- stage: integrate
-  displayName: Integrate Branch
-  dependsOn: []
-  condition: |
-    and
-    (
-      not(startsWith(variables['Build.SourceBranch'], 'refs/pull')),
-      not(startsWith(variables['Build.SourceBranch'], 'refs/heads/integration/'))
-    )
-  jobs:
-  - job: integrate
-    displayName: Integrate Branch
-    pool:
-      vmImage: windows-latest
-    variables:
-      runCodesignValidationInjection: false
-    steps:
-    - checkout: self
-      persistCredentials: true
-    - task: PowerShell@2
-      displayName: Integrate Branch
-      inputs:
-        filePath: .azure/scripts/integrate-branch.ps1
-        arguments: -Branch $(Build.SourceBranch)

.azure/azure-pipelines.ci.yml

@@ -23,6 +23,34 @@ name: 0.$(Date:yyyy).$(Date:MM).$(DayOfMonth).$(Rev:rr).0
 
 stages:
 
+- stage: build_dbgext
+  displayName: Build WinDbg Extension
+  dependsOn: []
+  jobs:
+  - template: ./templates/build-config-dbgext.yml
+    parameters:
+      arch: x64
+  - template: ./templates/build-config-dbgext.yml
+    parameters:
+      arch: x86
+
+- stage: build_winkernel
+  displayName: Build Windows Drivers
+  dependsOn: []
+  jobs:
+  - template: ./templates/build-config-winkernel.yml
+    parameters:
+      arch: x64
+  - template: ./templates/build-config-winkernel.yml
+    parameters:
+      arch: x86
+  - template: ./templates/build-config-winkernel.yml
+    parameters:
+      arch: arm
+  - template: ./templates/build-config-winkernel.yml
+    parameters:
+      arch: arm64
+
 - stage: build_windows
   displayName: Build Windows
   dependsOn: []
@@ -66,34 +94,6 @@ stages:
       arch: x64
       tls: mitls
 
-- stage: build_winkernel
-  displayName: Build Windows Drivers
-  dependsOn: []
-  jobs:
-  - template: ./templates/build-config-winkernel.yml
-    parameters:
-      arch: x64
-  - template: ./templates/build-config-winkernel.yml
-    parameters:
-      arch: x86
-  - template: ./templates/build-config-winkernel.yml
-    parameters:
-      arch: arm
-  - template: ./templates/build-config-winkernel.yml
-    parameters:
-      arch: arm64
-
-- stage: build_dbgext
-  displayName: Build WinDbg Extension
-  dependsOn: []
-  jobs:
-  - template: ./templates/build-config-dbgext.yml
-    parameters:
-      arch: x64
-  - template: ./templates/build-config-dbgext.yml
-    parameters:
-      arch: x86
-
 - stage: build_linux
   displayName: Build Linux
   dependsOn: []
@@ -115,35 +115,6 @@ stages:
       tls: stub
       extraBuildArgs: -DisableLogs -SanitizeAddress
 
-#
-# Mirror
-#
-
-- stage: mirror
-  displayName: Mirror
-  dependsOn:
-  - build_windows
-  - build_winkernel
-  - build_dbgext
-  - build_linux
-  condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/')))
-  jobs:
-  - job: mirror
-    displayName: Mirror branch
-    pool:
-      vmImage: windows-latest
-    steps:
-    - checkout: self
-      persistCredentials: true
-    - task: PowerShell@2
-      displayName: Sync Changes to AzDO Mirror Branch
-      inputs:
-        pwsh: true
-        filePath: .azure/scripts/sync-mirror.ps1
-        arguments: -Branch $(Build.SourceBranch)
-      env:
-        AzDO_PAT: $(AzDO_PAT)
-
 #
 # Build Verification Tests
 #
@@ -233,3 +204,32 @@ stages:
       platform: linux
       arch: x64
       tls: openssl
+
+#
+# Mirror
+#
+
+- stage: mirror
+  displayName: Mirror
+  dependsOn:
+  - build_windows
+  - build_winkernel
+  - build_dbgext
+  - build_linux
+  condition: and(in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/')), succeeded())
+  jobs:
+  - job: mirror
+    displayName: Mirror branch
+    pool:
+      vmImage: windows-latest
+    steps:
+    - checkout: self
+      persistCredentials: true
+    - task: PowerShell@2
+      displayName: Sync Changes to AzDO Mirror Branch
+      inputs:
+        pwsh: true
+        filePath: .azure/scripts/sync-mirror.ps1
+        arguments: -Branch $(Build.SourceBranch)
+      env:
+        AzDO_PAT: $(AzDO_PAT)