From a32d0c1314ede9fb6036796b2dc98c34a2e6b00f Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Fri, 28 Aug 2020 14:08:08 -0500 Subject: [PATCH] here --- lib/linter.sh | 2 +- lib/worker.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/linter.sh b/lib/linter.sh index a4ce7bb7..f27b3da7 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -1444,7 +1444,7 @@ if [ "${VALIDATE_CSHARP}" == "true" ]; then # Lint the C# files # ######################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "CSHARP" "dotnet-format" "dotnet-format --folder --check --include" ".*\.\(cs\)\$" "${FILE_ARRAY_CSHARP[@]}" + LintCodebase "CSHARP" "dotnet-format" "dotnet-format --folder --check --exclude / --include" ".*\.\(cs\)\$" "${FILE_ARRAY_CSHARP[@]}" fi ############### diff --git a/lib/worker.sh b/lib/worker.sh index ce064762..6a172bcf 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -233,6 +233,7 @@ function LintCodebase() { # Corner case for C# as it writes to tty and not stdout # ######################################################### elif [[ ${FILE_TYPE} == "CSHARP" ]]; then + info "got into the csharp loop" LINT_CMD=$( cd "${GITHUB_WORKSPACE}" || exit ${LINTER_COMMAND} "${FILE}" | tee /dev/tty2 2>&1; exit "${PIPESTATUS[0]}" @@ -480,6 +481,7 @@ function TestCodebase() { # Corner case for C# as it writes to tty and not stdout # ######################################################### elif [[ ${FILE_TYPE} == "CSHARP" ]]; then + info "got into the csharp loop" LINT_CMD=$( cd "${GITHUB_WORKSPACE}" || exit ${LINTER_COMMAND} "${FILE}" | tee /dev/tty2 2>&1; exit "${PIPESTATUS[0]}" @@ -642,7 +644,7 @@ function RunTestCases() { TestCodebase "CLOUDFORMATION" "cfn-lint" "cfn-lint --config-file ${CLOUDFORMATION_LINTER_RULES}" ".*\.\(json\|yml\|yaml\)\$" "cloudformation" TestCodebase "CLOJURE" "clj-kondo" "clj-kondo --config ${CLOJURE_LINTER_RULES} --lint" ".*\.\(clj\|cljs\|cljc\|edn\)\$" "clojure" TestCodebase "COFFEESCRIPT" "coffeelint" "coffeelint -f ${COFFEESCRIPT_LINTER_RULES}" ".*\.\(coffee\)\$" "coffeescript" - TestCodebase "CSHARP" "dotnet-format" "dotnet-format --check --folder --include" ".*\.\(cs\)\$" "csharp" + TestCodebase "CSHARP" "dotnet-format" "dotnet-format --check --folder --exclude / --include" ".*\.\(cs\)\$" "csharp" TestCodebase "CSS" "stylelint" "stylelint --config ${CSS_LINTER_RULES}" ".*\.\(css\|scss\|sass\)\$" "css" TestCodebase "DART" "dart" "dartanalyzer --fatal-infos --fatal-warnings --options ${DART_LINTER_RULES}" ".*\.\(dart\)\$" "dart" TestCodebase "DOCKERFILE" "dockerfilelint" "dockerfilelint -c ${DOCKERFILE_LINTER_RULES}" ".*\(Dockerfile\)\$" "docker"