Merged PR 5007596: Use main branch internally

Use main branch internally
This commit is contained in:
Jake Friedman 2020-08-04 23:28:11 +00:00 коммит произвёл Jake Friedman
Родитель f85b19817e
Коммит 39dbfeab1d
4 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -1,6 +1,6 @@
| CI Build |
|----|
| [![Build Status](https://microsoft.visualstudio.com/OneCore/_apis/build/status/FactoryOrchestrator/FO-PublicFacing-CI?branchName=master)](https://microsoft.visualstudio.com/OneCore/_build/latest?definitionId=54749&branchName=main) |
| [![Build Status](https://microsoft.visualstudio.com/OneCore/_apis/build/status/FactoryOrchestrator/FO-PublicFacing-CI?branchName=main)](https://microsoft.visualstudio.com/OneCore/_build/latest?definitionId=54749&branchName=main) |
# Introduction
Factory Orchestrator is a tool for built for Original Equipment Maufacturers to aid in the manufacturing of Windows devices.

Просмотреть файл

@ -8,7 +8,7 @@ pool:
#Your build pipeline references the BuildConfiguration variable, which youve selected to be settable at queue time. Create or edit the build pipeline for this YAML file, define the variable on the Variables tab, and then select the option to make it settable at queue time. See https://go.microsoft.com/fwlink/?linkid=865971
trigger:
- master
- main
pr: none
jobs:

Просмотреть файл

@ -8,7 +8,7 @@ pool:
#Your build pipeline references the BuildConfiguration variable, which youve selected to be settable at queue time. Create or edit the build pipeline for this YAML file, define the variable on the Variables tab, and then select the option to make it settable at queue time. See https://go.microsoft.com/fwlink/?linkid=865971
trigger:
- master
- main
pr: none
steps:

Просмотреть файл

@ -22,9 +22,9 @@ trigger:
- OSBuild*
variables:
${{ if or(startsWith(variables['Build.SourceBranchName'], 'OSBuild'), eq(variables['Build.SourceBranchName'], 'master')) }}:
${{ if or(startsWith(variables['Build.SourceBranchName'], 'OSBuild'), eq(variables['Build.SourceBranchName'], 'main')) }}:
VPACKNAME: ''
${{ if not(or(startsWith(variables['Build.SourceBranchName'], 'OSBuild'), eq(variables['Build.SourceBranchName'], 'master'))) }}:
${{ if not(or(startsWith(variables['Build.SourceBranchName'], 'OSBuild'), eq(variables['Build.SourceBranchName'], 'main'))) }}:
VPACKNAME: '.$(Build.SourceBranchName)'
# NOTES FOR PEOPLE USING THIS BUILD DEFINITION
@ -37,7 +37,7 @@ steps:
displayName: 'Package ES - Setup Build'
inputs:
branchVersion: true
branchVersionExcludeBranch: 'master'
branchVersionExcludeBranch: 'main'
productName: 'FactoryOrchestrator'
disableOutputRedirect: true
useDfs: true