[Localization] Sync Localization branch with Main (#11603)

Add changes to sync main into Localization branch

Co-authored-by: tj_devel709 <antlambe@microsoft.com>
Co-authored-by: Connor Adsit <cadsit@microsoft.com>
This commit is contained in:
TJ Lambert 2021-05-19 15:36:41 -05:00 коммит произвёл GitHub
Родитель cecc343301
Коммит 72496111df
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 10 добавлений и 0 удалений

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

@ -11,6 +11,7 @@ steps:
- checkout: self # https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema#checkout
clean: true # Executes: git clean -ffdx && git reset --hard HEAD
submodules: false
persistCredentials: true
- pwsh: |
Import-Module $Env:SYSTEM_DEFAULTWORKINGDIRECTORY/tools/devops/automation/scripts/GitHub.psm1
@ -155,6 +156,15 @@ steps:
continueOnError: true
workingDirectory: $(Build.SourcesDirectory)\tools\devops
- powershell: |
git config user.email "valco@microsoft.com"
git config user.name "vs-mobiletools-engineering-service2"
git checkout -b Localization origin/Localization
git merge origin/main
git push origin Localization
displayName: "Sync Localization branch with main"
condition: and(succeeded(), in(variables['build.reason'], 'Schedule', 'Manual'), eq(variables.isMain, 'True'))
- task: OneLocBuild@2
condition: and(succeeded(), eq(variables.isMain, 'True'))
continueOnError: true