Daniel Donenfeld
|
18dedb4838
|
throw on failed merge
|
2019-02-15 19:00:15 -08:00 |
|
Daniel Donenfeld
|
7e72576ace
|
Wrap checkout of master in cmd.exe call. ENable more builds to test the asm generation
|
2019-02-15 18:49:20 -08:00 |
|
Daniel Donenfeld
|
096d572749
|
Wrap noisy calls to git within cmd.exe invocation
|
2019-02-15 18:41:43 -08:00 |
|
Daniel Donenfeld
|
d02a3a8795
|
Try to merge commits individually into final branch, then squash
|
2019-02-15 18:30:41 -08:00 |
|
Daniel Donenfeld
|
8e6d1a4fe7
|
Remove logging from branch deletion. Fix deploy-asm inclusion of API-Functions (hopefully)
|
2019-02-15 18:18:09 -08:00 |
|
Daniel Donenfeld
|
e92e6e3f65
|
Add API functions file
|
2019-02-15 17:58:14 -08:00 |
|
Daniel Donenfeld
|
1949baf70e
|
Fix issue and refactor API accesses
|
2019-02-15 17:51:48 -08:00 |
|
Daniel Donenfeld
|
cf0d3268f0
|
checkout master, not origin master. Add logging
|
2019-02-15 17:40:12 -08:00 |
|
Daniel Donenfeld
|
64f17b570a
|
Remove some logging. Change checkout master command and fetch command
|
2019-02-15 16:12:47 -08:00 |
|
Daniel Donenfeld
|
5530359dbc
|
try merging local branches once they are checked-out
|
2019-02-15 13:20:30 -08:00 |
|
Daniel Donenfeld
|
9f9b17c870
|
checkout each asm branch to ensure it is available locally
|
2019-02-15 13:10:34 -08:00 |
|
Daniel Donenfeld
|
4eaff9d824
|
add call to git fetch origin
|
2019-02-15 13:00:22 -08:00 |
|
Daniel Donenfeld
|
aacf0301fc
|
redirect git to stdout so powershell doesn't see them as errors
|
2019-02-15 12:02:11 -08:00 |
|
Daniel Donenfeld
|
3d45a84f47
|
Add extra checks and logging
|
2019-02-15 11:36:40 -08:00 |
|
Daniel Donenfeld
|
5afeb81bf9
|
Add logging of branches. Throw on merge
|
2019-02-14 15:48:27 -08:00 |
|
Daniel Donenfeld
|
4b52cd13e1
|
Fix issue with merging asm branches
|
2019-02-14 15:35:22 -08:00 |
|
Daniel Donenfeld
|
7f5624662e
|
Add even more logging
|
2019-02-14 15:25:20 -08:00 |
|
Daniel Donenfeld
|
fceedfae2f
|
Add more logging
|
2019-02-14 15:12:07 -08:00 |
|
Daniel Donenfeld
|
49f62dc336
|
Add more logging
|
2019-02-14 15:01:31 -08:00 |
|
Daniel Donenfeld
|
ea64dc5e45
|
Add debug printing to deploy-asm
|
2019-02-14 14:46:00 -08:00 |
|
Daniel Donenfeld
|
f1120574e4
|
Fix powershell issue with Foreach-Object
|
2019-02-14 14:30:58 -08:00 |
|
Daniel Donenfeld
|
c8e21df269
|
try moving asm related scripts to asm\scripts folder
|
2019-02-14 11:14:32 -08:00 |
|