Skip to content

Commit

Permalink
Merge branch 'main' into features/roslynator
Browse files Browse the repository at this point in the history
  • Loading branch information
nvuillam committed Nov 26, 2023
2 parents 3daaf37 + 0484acb commit f680b93
Show file tree
Hide file tree
Showing 60 changed files with 700 additions and 438 deletions.
291 changes: 147 additions & 144 deletions .automation/generated/linter-helps.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions .automation/generated/linter-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"black": "23.11.0",
"cfn-lint": "0.83.3",
"checkmake": "0.2.0",
"checkov": "3.1.9",
"checkov": "3.1.15",
"checkstyle": "10.12.5",
"chktex": "1.7.8",
"clang-format": "16.0.6",
Expand All @@ -17,7 +17,7 @@
"cljstyle": "0.15.0",
"coffeelint": "5.2.11",
"cpplint": "1.6.1",
"csharpier": "0.26.2",
"csharpier": "0.26.3",
"cspell": "8.0.0",
"dartanalyzer": "0.0.0",
"devskim": "1.0.23",
Expand Down Expand Up @@ -48,16 +48,16 @@
"kubeconform": "0.6.4",
"kubescape": "2.9.0",
"kubeval": "0.16.1",
"lightning-flow-scanner": "2.15.0",
"lightning-flow-scanner": "2.16.0",
"lintr": "0.0.0",
"luacheck": "1.1.1",
"lychee": "0.13.0",
"markdown-link-check": "3.11.2",
"markdown-table-formatter": "1.4.0",
"markdown-table-formatter": "1.5.0",
"markdownlint": "0.37.0",
"misspell": "0.3.4",
"mypy": "1.7.0",
"npm-groovy-lint": "12.1.1",
"mypy": "1.7.1",
"npm-groovy-lint": "13.0.0",
"npm-package-json-lint": "7.1.0",
"perlcritic": "1.152",
"php": "7.4.26",
Expand Down Expand Up @@ -104,7 +104,7 @@
"syft": "0.97.1",
"tekton-lint": "0.6.0",
"terraform-fmt": "1.6.4",
"terragrunt": "0.53.5",
"terragrunt": "0.53.6",
"terrascan": "1.18.3",
"tflint": "0.49.0",
"trivy": "0.47.0",
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l

- Fixes
- Call jscpd with `--gitignore` to ignore copy-pastes in files matching `.gitignore`
- cpplint: Dynamically add the list of extensions from list of files in --extensions parameter

- Doc

Expand All @@ -39,6 +40,18 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
- [psalm](https://psalm.dev) from Psalm.5.15.0@ to **Psalm.5.16.0@** on 2023-11-22
- [puppet-lint](http://puppet-lint.com/) from 4.2.2 to **4.2.3** on 2023-11-22
- [pyright](https://github.com/Microsoft/pyright) from 1.1.336 to **1.1.337** on 2023-11-22
- [csharpier](https://csharpier.com/) from 0.26.2 to **0.26.3** on 2023-11-23
- [npm-groovy-lint](https://nvuillam.github.io/npm-groovy-lint/) from 12.1.1 to **12.1.2** on 2023-11-23
- [mypy](https://mypy.readthedocs.io/en/stable/) from 1.7.0 to **1.7.1** on 2023-11-23
- [checkov](https://www.checkov.io/) from 3.1.9 to **3.1.10** on 2023-11-23
- [terragrunt](https://terragrunt.gruntwork.io) from 0.53.5 to **0.53.6** on 2023-11-23
- [checkov](https://www.checkov.io/) from 3.1.10 to **3.1.11** on 2023-11-24
- [lightning-flow-scanner](https://github.com/Lightning-Flow-Scanner) from 2.15.0 to **2.16.0** on 2023-11-24
- [markdown-table-formatter](https://www.npmjs.com/package/markdown-table-formatter) from 1.4.0 to **1.5.0** on 2023-11-25
- [npm-groovy-lint](https://nvuillam.github.io/npm-groovy-lint/) from 12.1.2 to **12.2.0** on 2023-11-26
- [checkov](https://www.checkov.io/) from 3.1.11 to **3.1.14** on 2023-11-26
- [npm-groovy-lint](https://nvuillam.github.io/npm-groovy-lint/) from 12.2.0 to **13.0.0** on 2023-11-26
- [checkov](https://www.checkov.io/) from 3.1.14 to **3.1.15** on 2023-11-26
<!-- linter-versions-end -->

## [v7.6.0] - 2023-11-19
Expand Down
22 changes: 19 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ RUN apk add --no-cache \
lttng-ust-dev \
zlib \
zlib-dev \
openjdk11 \
openjdk17 \
perl \
perl-dev \
gnupg \
Expand Down Expand Up @@ -442,9 +442,15 @@ ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
# "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"

# JAVA installation
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
ENV PATH="$JAVA_HOME/bin:${PATH}"

# KOTLIN installation
# Next line commented because already managed by another linter
# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
# Next line commented because already managed by another linter
# ENV PATH="$JAVA_HOME/bin:${PATH}"

# PHP installation
RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \
&& export GITHUB_AUTH_TOKEN \
Expand Down Expand Up @@ -472,7 +478,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GI

# SALESFORCE installation
# Next line commented because already managed by another linter
# ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
# Next line commented because already managed by another linter
# ENV PATH="$JAVA_HOME/bin:${PATH}"
RUN sf plugins install @salesforce/plugin-packaging \
Expand All @@ -481,6 +487,10 @@ RUN sf plugins install @salesforce/plugin-packaging \
&& rm -rf /root/.npm/_cacache \

# SCALA installation
# Next line commented because already managed by another linter
# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
# Next line commented because already managed by another linter
# ENV PATH="$JAVA_HOME/bin:${PATH}"
&& curl --retry-all-errors --retry 10 -fLo coursier https://git.io/coursier-cli && \
chmod +x coursier

Expand Down Expand Up @@ -567,6 +577,12 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
# revive installation
# Managed with COPY --link --from=revive /usr/bin/revive /usr/bin/revive

# npm-groovy-lint installation
# Next line commented because already managed by another linter
# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
# Next line commented because already managed by another linter
# ENV PATH="$JAVA_HOME/bin:${PATH}"

# checkstyle installation
RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \
-H "Accept: application/vnd.github+json" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
[![MegaLinter](https://github.com/oxsecurity/megalinter/workflows/MegaLinter/badge.svg?branch=main)](https://github.com/oxsecurity/megalinter/actions?query=workflow%3AMegaLinter+branch%3Amain)
[![codecov](https://codecov.io/gh/oxsecurity/megalinter/branch/main/graph/badge.svg)](https://codecov.io/gh/oxsecurity/megalinter)
<!-- gh-dependents-info-used-by-start -->
[![](https://img.shields.io/static/v1?label=Used%20by&message=3191&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)<!-- gh-dependents-info-used-by-end -->
[![](https://img.shields.io/static/v1?label=Used%20by&message=3204&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)<!-- gh-dependents-info-used-by-end -->
[![Secured with Trivy](https://img.shields.io/badge/Trivy-secured-green?logo=docker)](https://github.com/aquasecurity/trivy)
[![GitHub contributors](https://img.shields.io/github/contributors/oxsecurity/megalinter.svg)](https://github.com/oxsecurity/megalinter/graphs/contributors/)
[![GitHub Sponsors](https://img.shields.io/github/sponsors/nvuillam)](https://github.com/sponsors/nvuillam)
Expand Down
Loading

0 comments on commit f680b93

Please sign in to comment.