[0.64] Expand PRs to build more flavors ***NO_CI*** (#8971)

This PR expands the number of flavors that are built for PRs to this branch. Addresses #8851
microsoft · Oct 28, 2021 · 986f897 · 986f897
1 parent 7ea0897
commit 986f897
Show file tree

Hide file tree

Showing 3 changed files with 161 additions and 94 deletions.
diff --git a/.ado/TestWACK.ps1 b/.ado/TestWACK.ps1
@@ -8,6 +8,9 @@ if (!(Test-Path $OutputPath)) {
 }
 
 if ($Configuration -eq 'Release') {
+    if ($Platform -eq 'x86') {
+        $Platform = 'Win32'
+    }
     $appxPath = Resolve-Path $PSScriptRoot\..\packages\playground\windows\AppPackages\playground\playground_1.0.0.0_${Platform}_Test\playground_1.0.0.0_$Platform.appx
     gci $appxPath
 

diff --git a/.ado/templates/run-windows-with-certificates.yml b/.ado/templates/run-windows-with-certificates.yml
@@ -9,10 +9,6 @@ parameters:
     type: string
   - name: buildConfiguration
     type: string
-    default: 'Debug'
-    values:
-      - Debug
-      - Release
   - name: buildPlatform
     type: string
   - name: deployOption
@@ -27,27 +23,31 @@ steps:
     parameters:
       buildEnvironment: ${{ parameters.BuildEnvironment }}
       encodedKey: ${{ parameters.encodedKey }}
+
+  # Work around issue of parameters not getting expanded in conditions properly
+  - powershell: |
+      Write-Host "##vso[task.setvariable variable=localConfig]${{ parameters.buildConfiguration }}"
 
   - task: CmdLine@2
     displayName: run-windows (Debug)
     inputs:
       script: yarn windows --no-packager --no-launch ${{ parameters.deployOption }} --arch ${{ parameters.buildPlatform }} --logging --buildLogDirectory ${{ parameters.buildLogDirectory }} --msbuildprops AppxPackageSigningEnabled=False
       workingDirectory: ${{ parameters.workingDirectory }}
-    condition: and(succeeded(), eq('${{ parameters.buildConfiguration }}', 'Debug'))
+    condition: and(succeeded(), eq(variables.localConfig, 'Debug'))
 
   - task: CmdLine@2
     displayName: run-windows (Release) - PR
     inputs:
       script: yarn windows --no-packager --no-launch ${{ parameters.deployOption }} --arch ${{ parameters.buildPlatform }} --logging --buildLogDirectory ${{ parameters.buildLogDirectory }} --release --msbuildprops AppxPackageSigningEnabled=False
       workingDirectory: ${{ parameters.workingDirectory }}
-    condition: and(succeeded(), eq('${{ parameters.buildConfiguration }}', 'Release'), eq('${{ parameters.buildEnvironment }}', 'PullRequest'))
+    condition: and(succeeded(), eq(variables.localConfig, 'Release'), eq('${{ parameters.buildEnvironment }}', 'PullRequest'))
 
   - task: CmdLine@2
     displayName: run-windows (Release) - CI
     inputs:
       script: yarn windows --no-packager --no-launch ${{ parameters.deployOption }} --arch ${{ parameters.buildPlatform }} --logging --buildLogDirectory ${{ parameters.buildLogDirectory }} --release --msbuildprops PackageCertificateKeyFile=$(Build.SourcesDirectory)\EncodedKey.pfx
       workingDirectory: ${{ parameters.workingDirectory }}
-    condition: and(succeeded(), eq('${{ parameters.buildConfiguration }}', 'Release'), eq('${{ parameters.buildEnvironment }}', 'Continuous'))
+    condition: and(succeeded(), eq(variables.localConfig, 'Release'), eq('${{ parameters.buildEnvironment }}', 'Continuous'))
 
   - template: ../templates/cleanup-certificate.yml
     parameters:

diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml
@@ -17,31 +17,31 @@ jobs:
     displayName: Universal PR
     strategy:
       matrix: # Why we only build some flavors: https://github.com/microsoft/react-native-windows/issues/4308
-        #X64Debug:
-        #  BuildConfiguration: Debug
-        #  BuildPlatform: x64
+        X64Debug:
+          BuildConfiguration: Debug
+          BuildPlatform: x64
         X64Release:
           BuildConfiguration: Release
           BuildPlatform: x64
         X86Debug:
           BuildConfiguration: Debug
           BuildPlatform: x86
           LayoutHeaders: true
-        #X86Release:
-        #  BuildConfiguration: Release
-        #  BuildPlatform: x86
-        #ArmDebug:
-        #  BuildConfiguration: Debug
-        #  BuildPlatform: ARM
+        X86Release:
+          BuildConfiguration: Release
+          BuildPlatform: x86
+        ArmDebug:
+          BuildConfiguration: Debug
+          BuildPlatform: ARM
         ArmRelease:
           BuildConfiguration: Release
           BuildPlatform: ARM
-        #Arm64Debug:
-        #  BuildConfiguration: Debug
-        #  BuildPlatform: ARM64
-        #Arm64Release:
-        #  BuildConfiguration: Release
-        #  BuildPlatform: ARM64
+        Arm64Debug:
+          BuildConfiguration: Debug
+          BuildPlatform: ARM64
+        Arm64Release:
+          BuildConfiguration: Release
+          BuildPlatform: ARM64
     pool:
       vmImage: $(VmImage)
     timeoutInMinutes: 60
@@ -210,12 +210,18 @@ jobs:
     displayName: Universal Other Projects PR
     strategy:
       matrix: # Why we only build some flavors: https://github.com/microsoft/react-native-windows/issues/4308
-        X86Debug:
+        X64Debug:
           BuildConfiguration: Debug
-          BuildPlatform: x86
+          BuildPlatform: x64
         X64Release:
           BuildConfiguration: Release
           BuildPlatform: x64
+        X86Debug:
+          BuildConfiguration: Debug
+          BuildPlatform: x86
+        X86Release:
+          BuildConfiguration: Release
+          BuildPlatform: x86
     pool:
       vmImage: $(VmImage)
     timeoutInMinutes: 60
@@ -293,33 +299,38 @@ jobs:
     displayName: Sample Apps PR
     strategy:
       matrix: # Why we only build some flavors: https://github.com/microsoft/react-native-windows/issues/4308
-        #X64Debug:
-        #  BuildConfiguration: Debug
-        #  BuildPlatform: x64
+        X64Debug:
+          BuildConfiguration: Debug
+          BuildPlatform: x64
+          DeployOption:
         X64Release:
           BuildConfiguration: Release
           BuildPlatform: x64
-          DeployOption:
+          DeployOption: --no-deploy # Can't deploy without certs
         X86Debug:
          BuildConfiguration: Debug
          BuildPlatform: x86
          DeployOption:
-        #X86Release:
-        #  BuildConfiguration: Release
-        #  BuildPlatform: x86
-        #ArmDebug:
-        #  BuildConfiguration: Debug
-        #  BuildPlatform: ARM
+        X86Release:
+          BuildConfiguration: Release
+          BuildPlatform: x86
+          DeployOption: --no-deploy # Can't deploy without certs
+        ArmDebug:
+          BuildConfiguration: Debug
+          BuildPlatform: ARM
+          DeployOption: --no-deploy
         ArmRelease:
           BuildConfiguration: Release
           BuildPlatform: ARM
           DeployOption: --no-deploy
-        #Arm64Debug:
-        #  BuildConfiguration: Debug
-        #  BuildPlatform: ARM64
-        #Arm64Release:
-        #  BuildConfiguration: Release
-        #  BuildPlatform: ARM64
+        Arm64Debug:
+          BuildConfiguration: Debug
+          BuildPlatform: ARM64
+          DeployOption: --no-deploy
+        Arm64Release:
+          BuildConfiguration: Release
+          BuildPlatform: ARM64
+          DeployOption: --no-deploy
     timeoutInMinutes: 60
     cancelTimeoutInMinutes: 5
     pool:
@@ -344,8 +355,7 @@ jobs:
         parameters:
           buildEnvironment: 'PullRequest'
           encodedKey: sampleAppCPPEncodedKey
-          ${{ if eq(variables.BuildConfiguration, 'Release') }}:
-            buildConfiguration: Release
+          buildConfiguration: $(BuildConfiguration)
           buildPlatform: $(BuildPlatform)
           deployOption: $(DeployOption)
           buildLogDirectory: $(BuildLogDirectory)
@@ -386,9 +396,15 @@ jobs:
         X86Debug:
           BuildConfiguration: Debug
           BuildPlatform: x86
+        X86Release:
+          BuildConfiguration: Release
+          BuildPlatform: x86
         ARM64Debug:
           BuildConfiguration: Debug
           BuildPlatform: ARM64
+        ARM64Release:
+          BuildConfiguration: Release
+          BuildPlatform: ARM64
     pool:
       vmImage: $(VmImage)
     timeoutInMinutes: 60 # how long to run the job before automatically cancelling
@@ -501,50 +517,62 @@ jobs:
           projectType: app
           additionalInitArguments: --namespace MyCompany.MyApplication.MyComponent
           additionalRunArguments:
-        #X86ReleaseCpp:
-        #  language: cpp
-        #  configuration: Release
-        #  platform: x86
-        #  projectType: app
-        #X86ReleaseCs:
-        #  language: cs
-        #  configuration: Release
-        #  platform: x86
-        #  projectType: app
-        #X64DebugCpp:
-        #  language: cpp
-        #  configuration: Debug
-        #  platform: x64
-        #  projectType: app
-        #X64DebugCs:
-        #  language: cs
-        #  configuration: Debug
-        #  platform: x64
-        #  projectType: app
-        X64ReleaseCpp:
+        X86ReleaseCpp:
           language: cpp
           configuration: Release
+          platform: x86
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy # Can't deploy without certs
+        X86ReleaseCs:
+          language: cs
+          configuration: Release
+          platform: x86
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy # Can't deploy without certs
+        X64DebugCpp:
+          language: cpp
+          configuration: Debug
           platform: x64
           projectType: app
           additionalInitArguments:
           additionalRunArguments:
+        X64DebugCs:
+          language: cs
+          configuration: Debug
+          platform: x64
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments:
+        X64ReleaseCpp:
+          language: cpp
+          configuration: Release
+          platform: x64
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy # Can't deploy without certs
         X64ReleaseCs:
           language: cs
           configuration: Release
           platform: x64
           projectType: app
           additionalInitArguments:
-          additionalRunArguments:
-        #ArmDebugCpp:
-        #  language: cpp
-        #  configuration: Debug
-        #  platform: arm
-        #  projectType: app
-        #ArmDebugCs:
-        #  language: cs
-        #  configuration: Debug
-        #  platform: arm
-        #  projectType: app
+          additionalRunArguments: --no-deploy # Can't deploy without certs
+        ArmDebugCpp:
+          language: cpp
+          configuration: Debug
+          platform: arm
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy
+        ArmDebugCs:
+          language: cs
+          configuration: Debug
+          platform: arm
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy
         ArmReleaseCpp:
           language: cpp
           configuration: Release
@@ -559,26 +587,34 @@ jobs:
           projectType: app
           additionalInitArguments:
           additionalRunArguments: --no-deploy
-        #Arm64DebugCpp:
-        #  language: cpp
-        #  configuration: Debug
-        #  platform: arm64
-        #  projectType: app
-        #Arm64DebugCs:
-        #  language: cs
-        #  configuration: Debug
-        #  platform: arm64
-        #  projectType: app
-        #Arm64ReleaseCpp:
-        #  language: cpp
-        #  configuration: Release
-        #  platform: arm64
-        #  projectType: app
-        #Arm64ReleaseCs:
-        #  language: cs
-        #  configuration: Release
-        #  platform: arm64
-        #  projectType: app
+        Arm64DebugCpp:
+          language: cpp
+          configuration: Debug
+          platform: arm64
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy
+        Arm64DebugCs:
+          language: cs
+          configuration: Debug
+          platform: arm64
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy
+        Arm64ReleaseCpp:
+          language: cpp
+          configuration: Release
+          platform: arm64
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy
+        Arm64ReleaseCs:
+          language: cs
+          configuration: Release
+          platform: arm64
+          projectType: app
+          additionalInitArguments:
+          additionalRunArguments: --no-deploy
         X86DebugCppLib:
           language: cpp
           configuration: Debug
@@ -593,6 +629,34 @@ jobs:
           projectType: lib
           additionalInitArguments:
           additionalRunArguments: --no-autolink --no-deploy
+        X64DebugCppLib:
+          language: cpp
+          configuration: Debug
+          platform: x64
+          projectType: lib
+          additionalInitArguments:
+          additionalRunArguments: --no-autolink --no-deploy
+        X64DebugCsLib:
+          language: cs
+          configuration: Debug
+          platform: x64
+          projectType: lib
+          additionalInitArguments:
+          additionalRunArguments: --no-autolink --no-deploy
+        Arm64DebugCppLib:
+          language: cpp
+          configuration: Debug
+          platform: arm64
+          projectType: lib
+          additionalInitArguments:
+          additionalRunArguments: --no-autolink --no-deploy
+        ArmDebugCsLib:
+          language: cs
+          configuration: Debug
+          platform: arm64
+          projectType: lib
+          additionalInitArguments:
+          additionalRunArguments: --no-autolink --no-deploy
 
     timeoutInMinutes: 50 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them