Commit Graph

88 Commits

Author SHA1 Message Date
Daniel Donenfeld
54cf763ab1 Try changing cherry-pick into origin/... 2019-02-16 21:30:38 -08:00
Daniel Donenfeld
c53294b92a Change merge of asm branches into final branch into cherry-pick 2019-02-16 21:09:30 -08:00
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
801422759c Revert "TEMPORARILY ADD THIS ASM"
This reverts commit c3b95d23259cd9a03979547b81b9b0cea38d8d0b.
2019-02-15 18:41:43 -08:00
Daniel Donenfeld
da5d6c2719 TEMPORARILY ADD THIS ASM 2019-02-15 18:41:42 -08:00
Daniel Donenfeld
bbec3b2a84 [skip ci] Update ASM for d02a3a8795 2019-02-16 02:35:11 +00: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
Daniel Donenfeld
0a5968c1db [skip ci] Update ASM for Visual Studio 2017_17_LLVM_x64_Release 2019-02-13 04:53:31 +00:00
Daniel Donenfeld
c60932942b [skip ci] Update ASM for Visual Studio 2017_17_LLVM_x64_Debug 2019-02-13 04:51:06 +00:00
Daniel Donenfeld
53d4b51162 [skip ci] Update ASM for Visual Studio 2017_14_LLVM_x64_Release 2019-02-13 04:48:29 +00:00
Daniel Donenfeld
a0187be0fc [skip ci] Update ASM for Visual Studio 2017_14_LLVM_x64_Debug 2019-02-13 04:46:01 +00:00
Daniel Donenfeld
91a68bf084 [skip ci] Update ASM for Visual Studio 2017_17_MSVC_x64_Release 2019-02-13 04:43:31 +00:00
Daniel Donenfeld
61e3cf9caa [skip ci] Update ASM for Visual Studio 2017_17_MSVC_x86_Release 2019-02-13 04:40:21 +00:00
Daniel Donenfeld
b797b6a7d0 [skip ci] Update ASM for Visual Studio 2017_17_MSVC_x64_Debug 2019-02-13 04:37:17 +00:00
Daniel Donenfeld
2b9b3f089d [skip ci] Update ASM for Visual Studio 2017_17_MSVC_x86_Debug 2019-02-13 04:34:17 +00:00
Daniel Donenfeld
5949b45a03 [skip ci] Update ASM for Visual Studio 2017_14_MSVC_x64_Release 2019-02-13 04:31:19 +00:00
Daniel Donenfeld
43e8aa2bcd [skip ci] Update ASM for Visual Studio 2017_14_MSVC_x86_Release 2019-02-13 04:28:10 +00:00
Daniel Donenfeld
ad163a4a61 [skip ci] Update ASM for Visual Studio 2017_14_MSVC_x64_Debug 2019-02-13 04:25:03 +00:00
Daniel Donenfeld
db652aebc2 [skip ci] Update ASM for Visual Studio 2017_14_MSVC_x86_Debug 2019-02-13 04:22:08 +00:00
Daniel Donenfeld
06688f2478 [skip ci] Update ASM for Visual Studio 2015_14_LLVM_x64_Release 2019-02-13 04:19:12 +00:00
Daniel Donenfeld
cb5a519941 [skip ci] Update ASM for Visual Studio 2015_14_LLVM_x64_Debug 2019-02-13 04:16:42 +00:00
Daniel Donenfeld
06482a2f2f [skip ci] Update ASM for Visual Studio 2015_14_MSVC_x64_Release 2019-02-13 04:13:51 +00:00
Daniel Donenfeld
953f67806a [skip ci] Update ASM for Visual Studio 2015_14_MSVC_x86_Release 2019-02-13 04:10:48 +00:00
Daniel Donenfeld
baec6cdcb8 [skip ci] Update ASM for Visual Studio 2015_14_MSVC_x64_Debug 2019-02-13 04:07:24 +00:00
Daniel Donenfeld
4022efb49c [skip ci] Update ASM for Visual Studio 2015_14_MSVC_x86_Debug 2019-02-13 04:03:55 +00:00
Daniel Donenfeld
7262240b19 [skip ci] Update ASM for Visual Studio 2017_17_LLVM_x64_Release 2019-02-12 01:05:03 +00:00
Daniel Donenfeld
5a1d804a5c [skip ci] Update ASM for Visual Studio 2017_17_LLVM_x64_Debug 2019-02-12 01:02:35 +00:00
Daniel Donenfeld
f92e5f4ce7 [skip ci] Update ASM for Visual Studio 2017_14_LLVM_x64_Release 2019-02-12 00:59:48 +00:00
Daniel Donenfeld
bf080e1926 [skip ci] Update ASM for Visual Studio 2017_14_LLVM_x64_Debug 2019-02-12 00:57:19 +00:00
Daniel Donenfeld
20239c5031 [skip ci] Update ASM for Visual Studio 2017_17_MSVC_x64_Release 2019-02-12 00:54:55 +00:00