@@ -255,10 +255,13 @@ def format_name(log_path):
255
255
return '/' .join (log_path .split ('/' )[- 2 :])
256
256
257
257
258
- def compare_logs (compare_script , new_log , old_log ):
258
+ def compare_logs (compare_script , new_log , old_log , log_dir , opt ):
259
259
"""Return diff of log files at paths `new_log` and `old_log`"""
260
260
print ('Comparing %s %s ...' % (format_name (old_log ), format_name (new_log )))
261
- subprocess .call ([compare_script , old_log , new_log ])
261
+ subprocess .call ([compare_script , '--old-file' , old_log ,
262
+ '--new-file' , new_log , '--format' , 'markdown' ,
263
+ '--output' , os .path .join (log_dir , 'latest_compare_{0}.md'
264
+ .format (opt ))])
262
265
263
266
264
267
def compare (args ):
@@ -288,10 +291,12 @@ def compare(args):
288
291
len (recent_logs ['master_Onone' ]) > 1 :
289
292
compare_logs (compare_script ,
290
293
recent_logs ['master_O' ][0 ],
291
- recent_logs ['master_O' ][1 ])
294
+ recent_logs ['master_O' ][1 ],
295
+ log_dir , 'O' )
292
296
compare_logs (compare_script ,
293
297
recent_logs ['master_Onone' ][0 ],
294
- recent_logs ['master_Onone' ][1 ])
298
+ recent_logs ['master_Onone' ][1 ],
299
+ log_dir , 'Onone' )
295
300
else :
296
301
print ('master/master comparison skipped: no previous master logs' )
297
302
else :
@@ -307,10 +312,12 @@ def compare(args):
307
312
else :
308
313
compare_logs (compare_script ,
309
314
recent_logs [current_branch + '_O' ][0 ],
310
- recent_logs [current_branch + '_O' ][1 ])
315
+ recent_logs [current_branch + '_O' ][1 ],
316
+ log_dir , 'O' )
311
317
compare_logs (compare_script ,
312
318
recent_logs [current_branch + '_Onone' ][0 ],
313
- recent_logs [current_branch + '_Onone' ][1 ])
319
+ recent_logs [current_branch + '_Onone' ][1 ],
320
+ log_dir , 'Onone' )
314
321
315
322
if len (recent_logs ['master_O' ]) == 0 or \
316
323
len (recent_logs ['master_Onone' ]) == 0 :
@@ -319,10 +326,12 @@ def compare(args):
319
326
else :
320
327
compare_logs (compare_script ,
321
328
recent_logs [current_branch + '_O' ][0 ],
322
- recent_logs ['master_O' ][0 ])
329
+ recent_logs ['master_O' ][0 ],
330
+ log_dir , 'O' )
323
331
compare_logs (compare_script ,
324
332
recent_logs [current_branch + '_Onone' ][0 ],
325
- recent_logs ['master_Onone' ][0 ])
333
+ recent_logs ['master_Onone' ][0 ],
334
+ log_dir , 'Onone' )
326
335
327
336
# TODO: Fail on large regressions
328
337
0 commit comments