Install R directly and don't report npm-groovy-lint usage stats (#2202)

* Install R directly

* Don't install zip

* Copy etc/R

* Move back to /home/r-library

* Copy directory contents

* Copy files

* mkdir

* recursive copy

* copy -r

* Revert R etc

* Don't create etc dir

* Disable ClassNameSameAsFilename rule

* insight kills

Co-authored-by: Admiral Awkbar <admiralawkbar@github.com>
This commit is contained in:
Marco Ferrari 2021-12-07 19:10:26 +01:00 committed by GitHub
parent 1d4680e2a7
commit f90bf96db8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 65 deletions

View file

@ -10,6 +10,9 @@
"ClassJavadoc": {
"enabled": false
},
"ClassNameSameAsFilename": {
"enabled": false
},
"ClosureAsLastMethodParameter": {
"enabled": false
},

View file

@ -21,7 +21,6 @@ FROM hadolint/hadolint:latest-alpine as dockerfile-lint
FROM assignuser/chktex-alpine:v0.1.1 as chktex
FROM zricethezav/gitleaks:v7.6.1 as gitleaks
FROM garethr/kubeval:0.15.0 as kubeval
FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib
FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
FROM scalameta/scalafmt:v3.1.2 as scalafmt
FROM rhysd/actionlint:1.6.8 as actionlint
@ -259,10 +258,12 @@ COPY --from=scalafmt /bin/scalafmt /usr/bin/
COPY --from=actionlint /usr/local/bin/actionlint /usr/bin/
#################
# Install Litnr #
# Install Lintr #
#################
COPY --from=lintr-lib /usr/lib/R/library/ /home/r-library
RUN R -e "install.packages(list.dirs('/home/r-library',recursive = FALSE), repos = NULL, type = 'source')"
RUN mkdir -p /home/r-library \
&& cp -r /usr/lib/R/library/ /home/r-library/ \
&& Rscript -e "install.packages(c('lintr','purrr'), repos = 'https://cloud.r-project.org/')" \
&& R -e "install.packages(list.dirs('/home/r-library',recursive = FALSE), repos = NULL, type = 'source')"
##################
# Install ktlint #

View file

@ -198,10 +198,12 @@ COPY --from=scalafmt /bin/scalafmt /usr/bin/
COPY --from=actionlint /usr/local/bin/actionlint /usr/bin/
#################
# Install Litnr #
# Install Lintr #
#################
COPY --from=lintr-lib /usr/lib/R/library/ /home/r-library
RUN R -e "install.packages(list.dirs('/home/r-library',recursive = FALSE), repos = NULL, type = 'source')"
RUN mkdir -p /home/r-library \
&& cp -r /usr/lib/R/library/ /home/r-library/ \
&& Rscript -e "install.packages(c('lintr','purrr'), repos = 'https://cloud.r-project.org/')" \
&& R -e "install.packages(list.dirs('/home/r-library',recursive = FALSE), repos = NULL, type = 'source')"
##################
# Install ktlint #

View file

@ -878,7 +878,7 @@ LINTER_COMMANDS_ARRAY['GITLEAKS']="gitleaks -q -c ${GITLEAKS_LINTER_RULES} --no-
LINTER_COMMANDS_ARRAY['GHERKIN']="gherkin-lint -c ${GHERKIN_LINTER_RULES}"
LINTER_COMMANDS_ARRAY['GO']="golangci-lint run -c ${GO_LINTER_RULES}"
LINTER_COMMANDS_ARRAY['GOOGLE_JAVA_FORMAT']="java -jar /usr/bin/google-java-format"
LINTER_COMMANDS_ARRAY['GROOVY']="npm-groovy-lint -c ${GROOVY_LINTER_RULES} --failon warning"
LINTER_COMMANDS_ARRAY['GROOVY']="npm-groovy-lint -c ${GROOVY_LINTER_RULES} --failon warning --no-insight"
LINTER_COMMANDS_ARRAY['HTML']="htmlhint --config ${HTML_LINTER_RULES}"
LINTER_COMMANDS_ARRAY['JAVA']="java -jar /usr/bin/checkstyle -c ${JAVA_LINTER_RULES}"
LINTER_COMMANDS_ARRAY['JAVASCRIPT_ES']="eslint --no-eslintrc -c ${JAVASCRIPT_ES_LINTER_RULES}"