From 6d8bc22b38400e44fc63c1785d33fe187c0bc90f Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Fri, 28 Jun 2024 18:09:28 +0200 Subject: [PATCH 1/3] create minimal markdown report if to large uses https://github.com/galaxyproject/planemo/pull/1462 --- planemo_ci_actions.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/planemo_ci_actions.sh b/planemo_ci_actions.sh index 3c7734d..d1feab1 100755 --- a/planemo_ci_actions.sh +++ b/planemo_ci_actions.sh @@ -194,7 +194,12 @@ if [ "$MODE" == "combine" ]; then find artifacts/ -name tool_test_output.json -exec sh -c 'planemo merge_test_reports "$@" upload/tool_test_output.json' sh {} + # create html and markdown reports [ "$PLANEMO_HTML_REPORT" == "true" ] && planemo test_reports upload/tool_test_output.json --test_output upload/tool_test_output.html - [ "$PLANEMO_MD_REPORT" == "true" ] && planemo test_reports upload/tool_test_output.json --test_output_markdown upload/tool_test_output.md + [ "$PLANEMO_MD_REPORT" == "true" ] && ( + planemo test_reports upload/tool_test_output.json --test_output_markdown upload/tool_test_output.md + if [ $(stat -f %z "upload/tool_test_output.md") -gt 1048576 ]; then + planemo test_reports upload/tool_test_output.json --test_output_minimal_markdown upload/tool_test_output.md + fi + ) # get statistics jq '.["tests"][]["data"]["status"]' upload/tool_test_output.json | sed 's/"//g' | sort | uniq -c > statistics.txt fi From eb7c7ae6ff240c896f2c28381c3a0f0ef3ff47cc Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Thu, 4 Jul 2024 19:16:44 +0200 Subject: [PATCH 2/3] fix shellcheck --- planemo_ci_actions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planemo_ci_actions.sh b/planemo_ci_actions.sh index d1feab1..437fdbd 100755 --- a/planemo_ci_actions.sh +++ b/planemo_ci_actions.sh @@ -196,7 +196,7 @@ if [ "$MODE" == "combine" ]; then [ "$PLANEMO_HTML_REPORT" == "true" ] && planemo test_reports upload/tool_test_output.json --test_output upload/tool_test_output.html [ "$PLANEMO_MD_REPORT" == "true" ] && ( planemo test_reports upload/tool_test_output.json --test_output_markdown upload/tool_test_output.md - if [ $(stat -f %z "upload/tool_test_output.md") -gt 1048576 ]; then + if [ "$(stat -f %z upload/tool_test_output.md)" -gt 1048576 ]; then planemo test_reports upload/tool_test_output.json --test_output_minimal_markdown upload/tool_test_output.md fi ) From 0e3b72cbac5fc30d9358049f0eac21dc47e07bb8 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Thu, 4 Jul 2024 19:20:29 +0200 Subject: [PATCH 3/3] fix test --- .github/workflows/tools.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tools.yaml b/.github/workflows/tools.yaml index 505ad9e..32fd645 100644 --- a/.github/workflows/tools.yaml +++ b/.github/workflows/tools.yaml @@ -185,7 +185,7 @@ jobs: grep tool1 lint_report.txt grep tool2 lint_report.txt grep "ERROR: Error 'HTTPConnectionPool" lint_report.txt - grep "Applying linter tests... CHECK" lint_report.txt + grep "TestsNoValid" lint_report.txt test-tools: name: Test testing of tools needs: [setup-ci-tools]