Commit Graph

672 Commits

Author SHA1 Message Date
Daniel Donenfeld
cee06dcad9 change compile only span test to test ASM generation system 2019-02-27 15:33:23 -08:00
Daniel Donenfeld
a4a700ea60 Reorder travis functions together 2019-02-27 15:24:55 -08:00
Daniel Donenfeld
840f1be8c6 Add retry command function to retry git push for final asm. 2019-02-27 14:26:14 -08:00
Daniel Donenfeld
0978c7bcf5 delete asm branches again 2019-02-27 11:58:49 -08:00
Daniel Donenfeld
383b32e169 [skip ci] Update ASM for c89e293dc9 2019-02-27 19:52:23 +00:00
Daniel Donenfeld
c89e293dc9 (Hopefully) Fix issue with diffing the asm branch and slight cleanup 2019-02-27 11:46:46 -08:00
Daniel Donenfeld
3168cbd7fb Temporarily turn off asm branch cleanup 2019-02-27 11:18:12 -08:00
Daniel Donenfeld
c1697529d2 Merge all branches into APPVEYOR_REPO_BRANCH instead of master in case otehr development branches are used. Try checking out APPVEYOR_REPO_BRANCH before collecting asm 2019-02-26 18:17:10 -08:00
Daniel Donenfeld
560a596cf8 Add logging 2019-02-26 18:02:03 -08:00
Daniel Donenfeld
adffa26f25 Fix git diff invocation by using origin/ branch 2019-02-26 17:00:34 -08:00
Daniel Donenfeld
30092d9f6f Only cherry-pick if there are asm diffs 2019-02-26 16:47:35 -08:00
Daniel Donenfeld
bcd7b60df7 Allow empty with git-cherry-pick 2019-02-16 21:46:29 -08:00
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
bdb9109561 log $jobs better 2019-02-15 17:33:01 -08:00
Daniel Donenfeld
a7012c27ab Add logging for delete asm 2019-02-15 17:21:56 -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
ddfcf070c8 Only delete asm branches if it is the last build 2019-02-15 11:51:34 -08:00
Daniel Donenfeld
3d45a84f47 Add extra checks and logging 2019-02-15 11:36:40 -08:00
Daniel Donenfeld
c9219945fa Delete branches for asm on finish 2019-02-14 16:26:34 -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
06675302a0 Prune down build matrix in appveyor for testing 2019-02-14 14:30:43 -08:00
Daniel Donenfeld
1b6295ebe1 change bat calling from powershell. Change asm test to test system 2019-02-14 12:05:53 -08:00
Daniel Donenfeld
92b096d7d4 Fix powershell issues 2019-02-14 11:46:12 -08:00
Daniel Donenfeld
91c3d4afa5 Add some debugging, fix env variable exists check 2019-02-14 11:36:22 -08:00
Daniel Donenfeld
c8e21df269 try moving asm related scripts to asm\scripts folder 2019-02-14 11:14:32 -08:00
Daniel Donenfeld
fe51338562 update appveyor to cd before calling deploy asm script 2019-02-14 11:02:04 -08:00
Daniel Donenfeld
190aa264f6 Add asm deployment script 2019-02-14 10:56:46 -08:00
Daniel Donenfeld
4b0ffca4d8 Update appveyor job to checkin asm to branch per job. Add deployment to merge all branches into master in one step 2019-02-14 10:52:06 -08:00