Merge branch 'main' into crossy-road

src/SourceBuild/content/eng/pipelines/ci-lite.yml

@@ -1,27 +0,0 @@
-# This yml is used by these pipelines and triggers:
-#
-# - dotnet-source-build-lite (internal)
-#   - PR: release/* and main, lite build
-#   - CI: main only, every batched commit, lite build
-
-trigger:
-  batch: true
-  branches:
-    include:
-    - main
-
-pr:
-  branches:
-    include:
-    - main
-    - release/*
-
-stages:
-- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-  - template: templates/stages/vmr-scan.yml
-
-- template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml
-  parameters:
-    isBuiltFromVmr: true
-    isSourceOnlyBuild: true
-    scope: lite

src/SourceBuild/content/eng/pipelines/ci.yml

@@ -14,9 +14,12 @@
 # - dotnet-source-build (internal)
 #   - PR: ultralite build
 #   - CI: release/* and internal/release/* only, every batched commit, full build
-#   - CI: main only, every batched commit, lite build
 #   - Schedule: main only, full build
 #
+# - dotnet-source-build-lite (internal)
+#   - PR: release/* and main, lite build, on-demand trigger
+#   - CI: main only, every batched commit, lite build
+#
 # - dotnet-unified-build (internal)
 #   - PR: lite build
 #   - CI: release/*, internal/release/* and main, every batched commit, full build
@@ -26,11 +29,8 @@ variables:
 - name: isSourceOnlyBuild
   value: ${{ contains(variables['Build.DefinitionName'], '-source-build') }}
 
-- name: isInternalBuild
-  value: ${{ eq(variables['System.TeamProject'], 'internal') }}
-
-- name: isMainBranch
-  value: ${{ in(variables['Build.SourceBranch'], 'refs/heads/main', 'refs/heads/main-ub') }}
+- name: isSourceOnlyBuildLite
+  value: ${{ contains(variables['Build.DefinitionName'], '-source-build-lite') }}
 
 - name: isScheduleTrigger
   value: ${{ eq(variables['Build.Reason'], 'Schedule') }}
@@ -48,11 +48,11 @@ stages:
     isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }}
     ${{ if eq(variables.isScheduleTrigger, 'true') }}:
       scope: full
+    ${{ elseif eq(variables.isSourceOnlyBuildLite, 'true') }}:
+      scope: lite
     ${{ elseif and(eq(variables.isPRTrigger, 'true'), eq(variables.isSourceOnlyBuild, 'true')) }}:
       scope: ultralite
     ${{ elseif and(eq(variables.isPRTrigger, 'true'), not(eq(variables.isSourceOnlyBuild, 'true'))) }}:
       scope: lite
-    ${{ elseif and(not(eq(variables.isPRTrigger, 'true')), eq(variables.isSourceOnlyBuild, 'true'), eq(variables.isInternalBuild, 'true'), eq(variables.isMainBranch, 'true')) }}:
-      scope: lite
     ${{ else }}:
       scope: full