forked from microsoft/live-share
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathazure-pipelines.yml
60 lines (46 loc) · 2.46 KB
/
azure-pipelines.yml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://learn.microsoft.com/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
trigger:
branches:
include:
- main
resources:
repositories:
- repository: self
type: git
ref: main
jobs:
- job: Job_1
displayName: Agent job 1
pool:
name: Azure Pipelines
steps:
- checkout: self
- task: InstallSSHKey@0
displayName: Install an SSH key
inputs:
hostName: 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== '
sshPublicKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDj2ZF+ASvxz/qhUTIJ0yO12YsYpcj6FSrOwBrnghFF38XwnW4gVuGt7pIYRQu/jM6O/LE9/aFp1ZZSws/NSxEccLNujpgWtJWG7Nklgc91SK82U/Y2Jbq8Oplgx5LvozCzvmj5BvEwcOeOE19p0AFvoBTD+ymE5WBx9tS0Ha84Yx9GFXf799bgQyQ1xu7x2vDDrtMJFeCT05pUrdPWuNEKXqpgwgdpRZ4/KMdM6WcsaZhXWYq1fzvwmdW+m3rmxa+agVHR9gQjY9Fm3valsiNzx+Yl+fC1pKOH+O/bnanZQGOIe4hAaAgpbmz8qhZAV/kS33sFT9joaVjE/pjjrj8ulXN8+JBISdAYdCc6vj3fF5s5imx2/fGnOL5N8B05oOu63E55BqL/7D9aWA16P8fPQ0PaL290+laIGJZSMDueyCt/vs2bXvIBfQkH2KRQ1DjLfiD/2O9NJ6Pe2LRPsyF0PSz2U+8oKuCHDk2FIC3efOUThEtBo111uoYX1axzNXJsjVdYN+fQQTa46xX5F1fhCdqe5ca0VEHvKQR2LYZqTH3NN93jDeqkahR9ApqQeAXX3cjSJv9kxUOVMhYxR7Z4oTeZDjmecNAIkSujrbdrGRscogpEqzLLyOcNSm25+4QPYn+jkrWOnEglGmVBLt3oIjVXHMG3N4t8l21TEHnVXw== cxwtool@microsoft.com
sshKeySecureFile: 6fc21a84-3d57-4f82-a499-6c67466ed0ad
- task: Bash@3
displayName: Merge main into live
inputs:
targetType: inline
script: >-
git config --local user.name "CXWTool Service Account"
git config --local user.email "cxwtool@microsoft.com"
git remote add ssh git@github.com:MicrosoftDocs/live-share-pr.git
git checkout main
git pull ssh main
git checkout live
git pull ssh live
git merge main
CONFLICTS=$(git ls-files -u | wc -l)
if [ "$CONFLICTS" -gt 0 ] ; then
echo "There is a merge conflict in live branch. Aborting"
git merge --abort
exit 1
else
echo "Merge OK"
git push ssh live
fi
...