ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix exploration merge (#7247)

Browse Source
This commit is contained in:
Anthony Dresser
2019-09-17 15:16:03 -07:00
committed by GitHub
parent 094d6f2339
commit 47a14bbbff
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
build/azure-pipelines/exploration-merge.yml
View File

@@ -3,24 +3,27 @@ trigger:
include: ['master'] include: ['master']
pr: none pr: none
steps: jobs:
- task: NodeTool@0 - job: Exploration Merge
inputs: container: ubuntu:16.04
versionSpec: "10.15.1" steps:
- task: NodeTool@0
inputs:
versionSpec: "10.15.1"
- script: | - script: |
set -e set -e
git config user.email "andresse@microsoft.com" git config user.email "andresse@microsoft.com"
git config user.name "AzureDataStudio" git config user.name "AzureDataStudio"
git remote add explore "$ADS_EXPLORE_REPO" git remote add explore "$ADS_EXPLORE_REPO"
git fetch explore git fetch explore
git checkout -b merge-branch explore/master git checkout -b merge-branch explore/master
git merge origin/master git merge origin/master
git push explore HEAD:master git push explore HEAD:master
displayName: Sync & Merge Explore displayName: Sync & Merge Explore