pool:
  vmImage: 'Ubuntu-16.04'

trigger:
  branches:
    include: ['master']
pr:
  branches:
    include: ['master']

steps:
- task: NodeTool@0
  inputs:
    versionSpec: "12.13.0"

- 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-x.y.z
    git merge origin/master

  displayName: Sync & Merge Exploration

pool:
  vmImage: 'Ubuntu-16.04'

trigger:
  branches:
    include: ['master']
pr:
  branches:
    include: ['master']

steps:
- task: NodeTool@0
  inputs:
    versionSpec: "12.13.0"

- 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-x.y.z
    git merge origin/master

    # Push master branch into exploration branch
    git push origin HEAD:electron-x.y.z

  displayName: Sync & Merge Exploration

Revert "exploration - do not merge back to branch automatically to keep repo small"
Revert "exploration - do not merge back to branch automatically to keep repo small"

This reverts commit e5d08ae4bc7ef6d97e0593572fbc07ab38c76999.
