diff --git a/.github/workflows/tools.yaml b/.github/workflows/tools.yaml index 45e20b8..b581e4d 100644 --- a/.github/workflows/tools.yaml +++ b/.github/workflows/tools.yaml @@ -184,7 +184,7 @@ jobs: run: | set -x # check if the ToolIDValid linter is called (no of tools - 1 ) times, i.e. is skipped once - if [ "$(grep -c ToolIDValid ToolIDValid) != "2" ]; then + if [ "$(grep -c ToolIDValid lint_report.txt)" != "2" ]; then echo "expecting exactly 2 tests for ToolIDValid"; exit 1; fi grep tool1 lint_report.txt diff --git a/planemo_ci_actions.sh b/planemo_ci_actions.sh index 046d5f8..2b832b3 100755 --- a/planemo_ci_actions.sh +++ b/planemo_ci_actions.sh @@ -115,6 +115,7 @@ if [ "$MODE" == "lint" ]; then for DIR in "${REPO_ARRAY[@]}"; do if [ "$WORKFLOWS" != "true" ]; then cat .lint_skip >> "$DIR"/.tt_skip + cat "$DIR"/.tt_skip (planemo shed_lint --tools --ensure_metadata --urls --skip_file "$DIR"/.tt_skip --report_level "$REPORT_LEVEL" --fail_level "$FAIL_LEVEL" --recursive "$DIR" "${ADDITIONAL_PLANEMO_OPTIONS[@]}" | tee -a lint_report.txt) || lint_fail=true else (planemo workflow_lint --report_level "$REPORT_LEVEL" --fail_level "$FAIL_LEVEL" "$DIR" "${ADDITIONAL_PLANEMO_OPTIONS[@]}" | tee -a lint_report.txt) || lint_fail=true