Merge pull request #678 from nvuillam/master

Groovy traps .nf extension (nextflow) + upgrade npm-groovy-lint
This commit is contained in:
Lukas Gravley 2020-09-04 09:12:34 -05:00 committed by GitHub
commit a961b77f71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions

6
dependencies/package-lock.json generated vendored
View file

@ -4054,9 +4054,9 @@
"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM="
},
"npm-groovy-lint": {
"version": "7.5.3",
"resolved": "https://registry.npmjs.org/npm-groovy-lint/-/npm-groovy-lint-7.5.3.tgz",
"integrity": "sha512-36vSKuR2pZzgHw2av3ukxCIGdu48meb5Wwk+sf9twDO7MD3YxyTi6RiUDE+gv+etRgODMoPE3sNrib2ujdopjA==",
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/npm-groovy-lint/-/npm-groovy-lint-7.5.4.tgz",
"integrity": "sha512-ShDRyW0s4z3OXrz2jSfLqiI7n8Iqvh8XtpBUS2vlX4CgL65IBk5rIt2swQOUL/UWUt3BTUg509ACzhD2g3arJA==",
"requires": {
"amplitude": "^5.1.2",
"ansi-colors": "^4.1.1",

View file

@ -16,7 +16,7 @@
"htmlhint": "^0.14.1",
"jsonlint": "^1.6.3",
"markdownlint-cli": "^0.23.2",
"npm-groovy-lint": "^7.5.3",
"npm-groovy-lint": "^7.5.4",
"prettier": "^2.1.1",
"prettyjson": "^1.2.1",
"sql-lint": "0.0.15",

View file

@ -211,7 +211,7 @@ function BuildFileList() {
# Get the GROOVY files #
########################
elif [ "$FILE_TYPE" == "groovy" ] || [ "$FILE_TYPE" == "jenkinsfile" ] ||
[ "$FILE_TYPE" == "gradle" ]; then
[ "$FILE_TYPE" == "gradle" ] || [ "$FILE_TYPE" == "nf" ]; then
################################
# Append the file to the array #
################################

View file

@ -1517,7 +1517,7 @@ if [ "$VALIDATE_GROOVY" == "true" ]; then
# Lint the groovy files #
#########################
# LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY"
LintCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "${FILE_ARRAY_GROOVY[@]}"
LintCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\|nf\)\$" "${FILE_ARRAY_GROOVY[@]}"
fi
################

View file

@ -677,7 +677,7 @@ function RunTestCases() {
TestCodebase "EDITORCONFIG" "editorconfig-checker" "editorconfig-checker" ".*\.ext$" "editorconfig-checker"
TestCodebase "ENV" "dotenv-linter" "dotenv-linter" ".*\.\(env\)\$" "env"
TestCodebase "GO" "golangci-lint" "golangci-lint run -c ${GO_LINTER_RULES}" ".*\.\(go\)\$" "golang"
TestCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "groovy"
TestCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\|nf\)\$" "groovy"
TestCodebase "HTML" "htmlhint" "htmlhint --config ${HTML_LINTER_RULES}" ".*\.\(html\)\$" "html"
TestCodebase "JAVA" "checkstyle" "java -jar /usr/bin/checkstyle -c ${JAVA_LINTER_RULES}" ".*\.\(java\)\$" "java"
TestCodebase "JAVASCRIPT_ES" "eslint" "eslint --no-eslintrc -c ${JAVASCRIPT_LINTER_RULES}" ".*\.\(js\)\$" "javascript"