eae5d8c807
These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
37 lines
751 B
YAML
37 lines
751 B
YAML
pool:
|
|
vmImage: "Ubuntu-16.04"
|
|
|
|
trigger: none
|
|
pr: none
|
|
|
|
steps:
|
|
- task: NodeTool@0
|
|
inputs:
|
|
versionSpec: "12.18.3"
|
|
|
|
- task: AzureKeyVault@1
|
|
displayName: "Azure Key Vault: Get Secrets"
|
|
inputs:
|
|
azureSubscription: "vscode-builds-subscription"
|
|
KeyVaultName: vscode
|
|
|
|
- script: |
|
|
set -e
|
|
|
|
cat << EOF > ~/.netrc
|
|
machine github.com
|
|
login vscode
|
|
password $(github-distro-mixin-password)
|
|
EOF
|
|
|
|
git config user.email "vscode@microsoft.com"
|
|
git config user.name "VSCode"
|
|
|
|
git checkout origin/electron-11.x.y
|
|
git merge origin/master
|
|
|
|
# Push master branch into exploration branch
|
|
git push origin HEAD:electron-11.x.y
|
|
|
|
displayName: Sync & Merge Exploration
|