From b31b696e00a167ef45bc270861a766a58ff70cbf Mon Sep 17 00:00:00 2001 From: "Goryudyuma(Kei.Matsumoto)" <6211370+Goryudyuma@users.noreply.github.com> Date: Sat, 5 Sep 2020 02:24:06 +0900 Subject: [PATCH 01/11] Just filter the .git folder --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index 7fb995a5..657172f2 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${FILE} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${FILE} == *".git"* ]]; then + elif [[ ${FILE} == *".git" || ${FILE} == *".git/"* ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${FILE} == *".venv"* ]]; then From 828de134a98547086dc702267c11893e90d408ed Mon Sep 17 00:00:00 2001 From: Lukas Gravley Date: Fri, 4 Sep 2020 13:22:01 -0500 Subject: [PATCH 02/11] this should be right --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index 657172f2..79bbb44a 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${FILE} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${FILE} == *".git" || ${FILE} == *".git/"* ]]; then + elif [[ ${FILE} == *".git/"* ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${FILE} == *".venv"* ]]; then From a0d4012b67cac9bc9c921024330db933e1b8cec5 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Tue, 8 Sep 2020 12:01:17 -0500 Subject: [PATCH 03/11] like this? --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index dd66abe7..d32bdc0b 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${FILE} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${FILE} == *".git/"* ]]; then + elif [[ ${FILE} == *".git"* ]] && [[ ${FILE} != *".github"* ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${FILE} == *".venv"* ]]; then From 0e5f996c3c68727d21824ff25bf80ebcbeb04477 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Tue, 8 Sep 2020 12:16:59 -0500 Subject: [PATCH 04/11] look at folders and not file names --- lib/worker.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/worker.sh b/lib/worker.sh index d32bdc0b..75f1af6a 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -160,19 +160,19 @@ function LintCodebase() { ###################################################### # Make sure we don't lint node modules or test cases # ###################################################### - if [[ ${FILE} == *"node_modules"* ]]; then + if [[ ${DIR_NAME} == *"node_modules"* ]]; then # This is a node modules file continue - elif [[ ${FILE} == *"${TEST_CASE_FOLDER}"* ]]; then + elif [[ ${DIR_NAME} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${FILE} == *".git"* ]] && [[ ${FILE} != *".github"* ]]; then + elif [[ ${DIR_NAME} == *".git"* ]] && [[ ${DIR_NAME} != *".github"* ]]; then # This is likely the .git folder and shouldn't be parsed continue - elif [[ ${FILE} == *".venv"* ]]; then + elif [[ ${DIR_NAME} == *".venv"* ]]; then # This is likely the python virtual environment folder and shouldn't be parsed continue - elif [[ ${FILE} == *".rbenv"* ]]; then + elif [[ ${DIR_NAME} == *".rbenv"* ]]; then # This is likely the ruby environment folder and shouldn't be parsed continue elif [[ ${FILE_TYPE} == "BASH" ]] && ! IsValidShellScript "${FILE}"; then From fd42f4b3fbc49ba65d9d29d4db84c2cbb11e24ea Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Tue, 8 Sep 2020 15:45:17 -0500 Subject: [PATCH 05/11] science... --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index 75f1af6a..ea731182 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${DIR_NAME} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${DIR_NAME} == *".git"* ]] && [[ ${DIR_NAME} != *".github"* ]]; then + elif [[ ${DIR_NAME} == *".git"* ]] || [[ ${DIR_NAME} == *".git/"* ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${DIR_NAME} == *".venv"* ]]; then From e9811c85d6cb375158a20eaaf44e638348573478 Mon Sep 17 00:00:00 2001 From: Lukas Gravley Date: Tue, 8 Sep 2020 16:00:12 -0500 Subject: [PATCH 06/11] Update lib/worker.sh yes Co-authored-by: Goryudyuma(Kei.Matsumoto) <6211370+Goryudyuma@users.noreply.github.com> --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index ea731182..59e9c572 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${DIR_NAME} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${DIR_NAME} == *".git"* ]] || [[ ${DIR_NAME} == *".git/"* ]]; then + elif [[ ${DIR_NAME} == *".git" ]] || [[ ${DIR_NAME} == *".git/"* ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${DIR_NAME} == *".venv"* ]]; then From 17c3ded69535845693bac9c25039659b02de7d4f Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Wed, 9 Sep 2020 09:24:27 -0500 Subject: [PATCH 07/11] i forgot how this works --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index ea731182..1d1b4d9b 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${DIR_NAME} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${DIR_NAME} == *".git"* ]] || [[ ${DIR_NAME} == *".git/"* ]]; then + elif [[ ${DIR_NAME} == *".git" ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${DIR_NAME} == *".venv"* ]]; then From eb67d9b9c6d44a62eac9f4f769e626c8b911fec5 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Wed, 9 Sep 2020 09:28:39 -0500 Subject: [PATCH 08/11] fix that dumb action --- lib/worker.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/worker.sh b/lib/worker.sh index 0a87a809..1d1b4d9b 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,11 +166,7 @@ function LintCodebase() { elif [[ ${DIR_NAME} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue -<<<<<<< HEAD elif [[ ${DIR_NAME} == *".git" ]]; then -======= - elif [[ ${DIR_NAME} == *".git" ]] || [[ ${DIR_NAME} == *".git/"* ]]; then ->>>>>>> e9811c85d6cb375158a20eaaf44e638348573478 # This is likely the .git folder and shouldn't be parsed continue elif [[ ${DIR_NAME} == *".venv"* ]]; then From dbd4cd673db50b244266593881ebfd0540f2c179 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Wed, 9 Sep 2020 10:04:21 -0500 Subject: [PATCH 09/11] this has to be right --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index 1d1b4d9b..203eaffe 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${DIR_NAME} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${DIR_NAME} == *".git" ]]; then + elif [[ ${DIR_NAME} == *".git" ]] || [[ ${FILE_NAME} == *".git/"* ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${DIR_NAME} == *".venv"* ]]; then From 880380d118932ff2352fda3b7df24758e2a35b70 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Wed, 9 Sep 2020 10:18:12 -0500 Subject: [PATCH 10/11] if i could only read --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index 203eaffe..11390894 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${DIR_NAME} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${DIR_NAME} == *".git" ]] || [[ ${FILE_NAME} == *".git/"* ]]; then + elif [[ ${DIR_NAME} == *".git" ]] || [[ ${FILE} == *".git/"* ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${DIR_NAME} == *".venv"* ]]; then From b5d42bf181889d1f80b472fec142212c42bac99b Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Wed, 9 Sep 2020 10:37:02 -0500 Subject: [PATCH 11/11] this makes no sense --- lib/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.sh b/lib/worker.sh index 11390894..44375fcd 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -166,7 +166,7 @@ function LintCodebase() { elif [[ ${DIR_NAME} == *"${TEST_CASE_FOLDER}"* ]]; then # This is the test cases, we should always skip continue - elif [[ ${DIR_NAME} == *".git" ]] || [[ ${FILE} == *".git/"* ]]; then + elif [[ ${DIR_NAME} == *".git" ]] || [[ ${FILE} == *".git" ]] || [[ ${FILE} == *".git/"* ]]; then # This is likely the .git folder and shouldn't be parsed continue elif [[ ${DIR_NAME} == *".venv"* ]]; then