diff --git a/.github/scripts/merge-bench-reports.sh b/.github/scripts/merge-bench-reports.sh index b36d9c77f28..05e84701f61 100755 --- a/.github/scripts/merge-bench-reports.sh +++ b/.github/scripts/merge-bench-reports.sh @@ -14,7 +14,12 @@ for report in ./reports/*; do FILE_PATH=$(echo $(ls $report)) # Extract the $NAME_PLURAL array from each report and merge it - combined_reports=$(jq '[."'"$NAME_PLURAL"'"[]] + '"$combined_reports" <<< "$(cat "$report/$FILE_PATH")") + if [ "$2" == "1" ]; then + echo $report + combined_reports=$(jq '[."'"$NAME_PLURAL"'"[]] + '"$combined_reports" <<< "$(cat "$report")") + else + combined_reports=$(jq '[."'"$NAME_PLURAL"'"[]] + '"$combined_reports" <<< "$(cat "$report/$FILE_PATH")") + fi done # Wrap the merged memory reports into a new object as to keep the $NAME_PLURAL key diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 0ffeaff768a..eaaba3c824e 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -130,7 +130,7 @@ jobs: - name: Merge compilation reports using jq run: | mv ./.github/scripts/merge-bench-reports.sh merge-bench-reports.sh - ./merge-bench-reports.sh program + ./merge-bench-reports.sh program 1 mv ./program.json ./gates_report_brillig.json - name: Compare Brillig bytecode size reports diff --git a/test_programs/gates_report_brillig.sh b/test_programs/gates_report_brillig.sh index 4a10dd79461..3f2a4542735 100755 --- a/test_programs/gates_report_brillig.sh +++ b/test_programs/gates_report_brillig.sh @@ -28,6 +28,6 @@ done echo "]" >> Nargo.toml -nargo info --force-brillig --json --inliner-aggressiveness $1 | jq -r ".programs[].functions = []" > gates_report_brillig.json +nargo info --silence-warnings --force-brillig --json --inliner-aggressiveness $1 | jq -r ".programs[].functions = []" > gates_report_brillig.json rm Nargo.toml