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 11, 2025
2 parents 252a4f8 + afeb007 commit 5147c68
Show file tree
Hide file tree
Showing 57 changed files with 247 additions and 235 deletions.
4 changes: 4 additions & 0 deletions .automation/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -3106,6 +3106,10 @@ def get_badges(
badges = []
repo = get_github_repo(linter)

if (hasattr(linter, "get") and linter.get("disabled") is True) or (
hasattr(linter, "disabled") and linter.disabled is True
):
badges += ["![disabled](https://shields.io/badge/-disabled-orange)"]
if (hasattr(linter, "get") and linter.get("deprecated") is True) or (
hasattr(linter, "deprecated") and linter.deprecated is True
):
Expand Down
8 changes: 4 additions & 4 deletions .automation/generated/linter-helps.json

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

12 changes: 6 additions & 6 deletions .automation/generated/linter-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bash-exec": "5.2.26",
"bicep_linter": "0.32.4",
"black": "24.10.0",
"cfn-lint": "1.22.3",
"cfn-lint": "1.22.4",
"checkmake": "0.2.0",
"checkov": "3.2.352",
"checkstyle": "10.21.1",
Expand All @@ -17,7 +17,7 @@
"cljstyle": "0.17.642",
"coffeelint": "5.2.11",
"cpplint": "2.0.0",
"csharpier": "0.30.5",
"csharpier": "0.30.6",
"cspell": "8.17.1",
"dartanalyzer": "0.0.0",
"detekt": "1.23.7",
Expand Down Expand Up @@ -84,9 +84,9 @@
"rst-lint": "1.4.0",
"rstcheck": "6.2.4",
"rstfmt": "0.0.14",
"rubocop": "1.69.2",
"ruff": "0.9.0",
"ruff-format": "0.9.0",
"rubocop": "1.70.0",
"ruff": "0.9.1",
"ruff-format": "0.9.1",
"scalafix": "0.13.0",
"scss-lint": "0.60.0",
"secretlint": "9.0.0",
Expand Down Expand Up @@ -115,7 +115,7 @@
"tflint": "0.54.0",
"trivy": "0.58.1",
"trivy-sbom": "0.58.1",
"trufflehog": "3.88.1",
"trufflehog": "3.88.2",
"ts-standard": "12.0.2",
"tsqllint": "1.16.0.0",
"v8r": "4.2.1",
Expand Down
2 changes: 2 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Run `make` for Makefile help. Initialize virtualenv and install dependencies wit

You can lint with `make megalinter` (Incoming)

If you need to run `build.sh` commands manually you need to run `source .venv/bin/activate` first.

### 5. Submit a pull request

[Create a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) and [refer to the issue number](https://help.github.com/en/github/writing-on-github/autolinked-references-and-urls) using #123, where 123 is the issue number.
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,12 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
- [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
- [cfn-lint](https://github.com/aws-cloudformation/cfn-lint) from 1.22.3 to **1.22.4** on 2025-01-10
- [trufflehog](https://github.com/trufflesecurity/trufflehog) from 3.88.1 to **3.88.2** on 2025-01-10
- [rubocop](https://rubocop.org/) from 1.69.2 to **1.70.0** on 2025-01-10
- [csharpier](https://csharpier.com/) from 0.30.5 to **0.30.6** on 2025-01-10
- [ruff-format](https://github.com/astral-sh/ruff) from 0.9.0 to **0.9.1** on 2025-01-10
- [ruff](https://github.com/astral-sh/ruff) from 0.9.0 to **0.9.1** on 2025-01-10
<!-- 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 @@ -18,11 +18,11 @@ ARG BASH_SHELLCHECK_VERSION=v0.10.0
# renovate: datasource=docker depName=hadolint/hadolint
ARG DOCKERFILE_HADOLINT_VERSION=v2.12.0-alpine
# renovate: datasource=docker depName=mstruebing/editorconfig-checker
ARG EDITORCONFIG_EDITORCONFIG_CHECKER_VERSION=v3.0.3
ARG EDITORCONFIG_EDITORCONFIG_CHECKER_VERSION=v3.1.2
# renovate: datasource=docker depName=ghcr.io/yannh/kubeconform
ARG KUBERNETES_KUBECONFORM_VERSION=v0.6.7-alpine
# renovate: datasource=docker depName=yoheimuta/protolint
ARG PROTOBUF_PROTOLINT_VERSION=0.51.0
ARG PROTOBUF_PROTOLINT_VERSION=0.52.0
# renovate: datasource=docker depName=zricethezav/gitleaks
ARG REPOSITORY_GITLEAKS_VERSION=v8.22.1
# renovate: datasource=docker depName=checkmarx/kics
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.14.0
ARG SFDX_HARDIS_VERSION=5.14.3
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 5147c68

Please sign in to comment.