Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Localization] Changing the merge to a Pseudo Force Push #11790

Merged
merged 1 commit into from
Jun 4, 2021
Merged

[Localization] Changing the merge to a Pseudo Force Push #11790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions tools/devops/automation/templates/build/configure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,12 @@ steps:
- 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 branch -d Localization
git push origin --delete Localization
git checkout -b Localization
git push origin Localization
displayName: "Sync Localization branch with main"
condition: and(succeeded(), in(variables['build.reason'], 'Schedule', 'Manual'), eq(variables.isMain, 'True'))
displayName: "Create a new Localization branch from main"
condition: and(succeeded(), in(variables['build.reason'], 'Schedule'), eq(variables.isMain, 'True'))

- task: OneLocBuild@2
condition: and(succeeded(), eq(variables.isMain, 'True'))
Expand Down