huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add update-master target

This commit is contained in:
Brice Lambson 2014-10-06 10:35:32 -07:00
parent 83f1901844
commit 6d1a6c5231
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makefile.shade
View File

@ -132,20 +132,15 @@ functions
} }
} }
#reset-master #update-master
-// Resets master branch to release -// Merge release branch to master
for each='var repo in GetAllRepos()' for each='var repo in GetAllRepos()'
-CloneOrUpdate(repo); -CloneOrUpdate(repo);
var gitFolder = '${repo}' var gitFolder = '${repo}'
git gitCommand='fetch origin' git gitCommand='fetch origin'
git gitCommand='checkout origin/release -B master' git gitCommand='merge origin/release --ff-only'
git gitCommand='push origin master:master'
#push-master
-// Resets master branch to release
for each='var repo in GetAllRepos()'
var gitFolder = '${repo}'
git gitCommand='push origin master:master -f'
#only-compile target='compile' #only-compile target='compile'
@{ @{