diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index cffdbca..abd2ac5 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -11,7 +11,7 @@ jobs: fail-fast: true max-parallel: 1 matrix: - luceeVersion: [ 5.4/snapshot/light, 6.0/snapshot/light, 6.1/snapshot/light, 6.1.0/snapshot/light, 6.2/snapshot/light ] + luceeVersion: [ 5.4/snapshot/light, 6.0/snapshot/light ] javaVersion: [ 11, 21 ] exclude: - luceeVersion: 5.4/snapshot/jar diff --git a/custom/benchmark/report.cfm b/custom/benchmark/report.cfm index 5b61d42..3a849a3 100644 --- a/custom/benchmark/report.cfm +++ b/custom/benchmark/report.cfm @@ -33,12 +33,33 @@ fileAppend( server.system.environment.GITHUB_STEP_SUMMARY, "> #arguments.message##chr(10)#"); throw arguments.message; } else { - fileAppend( server.system.environment.GITHUB_STEP_SUMMARY, " #arguments.message##chr(10)#"); + fileAppend( server.system.environment.GITHUB_STEP_SUMMARY, "#arguments.message##chr(10)#"); } } systemOutput( serializeJSON( q, true) ); + + hdr = []; + div = []; + loop list=q.columnlist item=col { + arrayAppend( hrd, col ); + arrayAppend( div, "---" ); + } + _logger( "" ); + _logger( "|" & arrayToList( hdr, "|" ) & "|" ); + _logger( "|" & arrayToList( div, "|" ) & "|" ); + + row = []; + loop query=q { + loop list=q.columnlist item=col { + arrayAppend( row, q [ col ] ); + } + _logger( "|" & arrayToList( row, "|" ) & "|" ); + row = []; + } + + _logger( "" ); @@ -59,8 +80,9 @@ - _logger( "## #UCase( _inspect )# Benchmarks - #q.runs# runs" ); - _logger( "![#_inspect# Benchmarks](data:image/png;base64,#toBase64( graph )#)" ); + _logger( "## Inspect #UCase( _inspect )# Benchmarks - #q.runs# runs" ); + _logger( "" ); + _logger( "![Inspect #UCase( _inspect )# Benchmarks](data:image/png;base64,#toBase64( graph )#)" ); @@ -76,5 +98,6 @@ _logger( "## Memory Benchmarks - #q.runs# runs" ); - _logger( "!Memory Benchmarks](data:image/png;base64,#toBase64( graph )#)" ); + _logger( "" ); + _logger( "![Memory Benchmarks](data:image/png;base64,#toBase64( graph )#)" );