Skip to content

Commit

Permalink
Merge branch 'main' into renovate/python-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
bdovaz authored Jan 10, 2025
2 parents 43e11f8 + 4c2b4d4 commit 252a4f8
Show file tree
Hide file tree
Showing 51 changed files with 193 additions and 159 deletions.
2 changes: 1 addition & 1 deletion .automation/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@ def process_type(linters_by_type, type1, type_label, linters_tables_md):
if hasattr(linter, "disabled") and linter.disabled is True:
linter_doc_md += [""]
linter_doc_md += ["_This linter has been disabled in this version_"]
if hasattr(linter, "disabled_reason") and linter.disabled_reason is True:
if hasattr(linter, "disabled_reason") and linter.disabled_reason:
linter_doc_md += [""]
linter_doc_md += [f"_Disabled reason: {linter.disabled_reason}_"]

Expand Down
29 changes: 18 additions & 11 deletions .automation/generated/linter-helps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions .automation/generated/linter-versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"actionlint": "1.7.5",
"actionlint": "1.7.6",
"ansible-lint": "24.12.2",
"arm-ttk": "0.0.0",
"bandit": "1.8.0",
Expand All @@ -8,11 +8,11 @@
"black": "24.10.0",
"cfn-lint": "1.22.3",
"checkmake": "0.2.0",
"checkov": "3.2.347",
"checkov": "3.2.352",
"checkstyle": "10.21.1",
"chktex": "1.7.8",
"clang-format": "17.0.6",
"clippy": "0.1.83",
"clippy": "0.1.84",
"clj-kondo": "2024.11.14",
"cljstyle": "0.17.642",
"coffeelint": "5.2.11",
Expand Down Expand Up @@ -63,7 +63,7 @@
"npm-package-json-lint": "8.0.0",
"perlcritic": "1.156",
"php": "7.4.26",
"php-cs-fixer": "3.66.1",
"php-cs-fixer": "3.67.0",
"phpcs": "3.11.2",
"phplint": "9.5.5",
"phpstan": "2.1.1",
Expand All @@ -85,8 +85,8 @@
"rstcheck": "6.2.4",
"rstfmt": "0.0.14",
"rubocop": "1.69.2",
"ruff": "0.8.6",
"ruff-format": "0.8.6",
"ruff": "0.9.0",
"ruff-format": "0.9.0",
"scalafix": "0.13.0",
"scss-lint": "0.60.0",
"secretlint": "9.0.0",
Expand All @@ -99,7 +99,7 @@
"shellcheck": "0.10.0",
"shfmt": "3.10.0",
"snakefmt": "0.10.2",
"snakemake": "8.26.0",
"snakemake": "8.27.1",
"spectral": "6.14.2",
"sql-lint": "1.0.0",
"sqlfluff": "3.3.0",
Expand Down
4 changes: 3 additions & 1 deletion .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ CVE-2024-24788
CVE-2024-24790
CVE-2024-45337
CVE-2024-45338
# go-git
CVE-2025-21613
CVE-2025-21614

# java PMD
CVE-2024-7254
Expand All @@ -33,7 +36,6 @@ CVE-2023-39325
CVE-2023-45283
CVE-2023-49569
CVE-2023-49568
CVE-2025-21614

# node
# json-path
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,17 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
- [checkov](https://www.checkov.io/) from 3.2.346 to **3.2.347** on 2025-01-06
- [vale](https://vale.sh/) from 3.9.1 to **3.9.3** on 2025-01-06
- [trufflehog](https://github.com/trufflesecurity/trufflehog) from 3.88.0 to **3.88.1** on 2025-01-07
- [actionlint](https://rhysd.github.io/actionlint/) from 1.7.5 to **1.7.6** on 2025-01-07
- [checkov](https://www.checkov.io/) from 3.2.347 to **3.2.349** on 2025-01-07
- [php-cs-fixer](https://cs.symfony.com/) from 3.66.1 to **3.66.2** on 2025-01-07
- [checkov](https://www.checkov.io/) from 3.2.349 to **3.2.350** on 2025-01-07
- [php-cs-fixer](https://cs.symfony.com/) from 3.66.2 to **3.67.0** on 2025-01-08
- [checkov](https://www.checkov.io/) from 3.2.350 to **3.2.351** on 2025-01-08
- [snakemake](https://snakemake.readthedocs.io/en/stable/) from 8.26.0 to **8.27.1** on 2025-01-08
- [ruff-format](https://github.com/astral-sh/ruff) from 0.8.6 to **0.9.0** on 2025-01-09
- [ruff](https://github.com/astral-sh/ruff) from 0.8.6 to **0.9.0** on 2025-01-09
- [checkov](https://www.checkov.io/) from 3.2.351 to **3.2.352** on 2025-01-09
- [clippy](https://github.com/rust-lang/rust-clippy) from 0.1.83 to **0.1.84** on 2025-01-09
<!-- linter-versions-end -->

## [v8.3.0] - 2024-11-23
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#############################################################################################
#ARGTOP__START
# renovate: datasource=docker depName=rhysd/actionlint
ARG ACTION_ACTIONLINT_VERSION=1.7.5
ARG ACTION_ACTIONLINT_VERSION=1.7.6
# renovate: datasource=docker depName=koalaman/shellcheck
ARG BASH_SHELLCHECK_VERSION=v0.10.0
# renovate: datasource=docker depName=hadolint/hadolint
Expand All @@ -28,7 +28,7 @@ ARG REPOSITORY_GITLEAKS_VERSION=v8.22.1
# renovate: datasource=docker depName=checkmarx/kics
ARG REPOSITORY_KICS_VERSION=v2.1.3-alpine
# renovate: datasource=docker depName=trufflesecurity/trufflehog
ARG REPOSITORY_TRUFFLEHOG_VERSION=3.88.1
ARG REPOSITORY_TRUFFLEHOG_VERSION=3.88.2
# renovate: datasource=docker depName=jdkato/vale
ARG SPELL_VALE_VERSION=v3.9.3
# renovate: datasource=docker depName=ghcr.io/terraform-linters/tflint
Expand Down Expand Up @@ -107,7 +107,7 @@ ARG SALESFORCE_CLI_VERSION=2.70.7
# renovate: datasource=npm depName=@salesforce/plugin-packaging
ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.9.10
# renovate: datasource=npm depName=sfdx-hardis
ARG SFDX_HARDIS_VERSION=5.11.0
ARG SFDX_HARDIS_VERSION=5.14.0
ARG ARM_TTK_NAME='master.zip'
ARG ARM_TTK_URI='https://github.com/Azure/arm-ttk/archive/master.zip'
ARG ARM_TTK_DIRECTORY='/opt/microsoft'
Expand Down
Loading

0 comments on commit 252a4f8

Please sign in to comment.