Skip to content

Commit

Permalink
Merge branch 'main' into renovate/salesforce-plugin-packaging-2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
nvuillam authored Jul 15, 2024
2 parents d0544d2 + b5066c9 commit 4af02a0
Show file tree
Hide file tree
Showing 42 changed files with 261 additions and 219 deletions.
48 changes: 28 additions & 20 deletions .automation/generated/linter-helps.json

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

20 changes: 10 additions & 10 deletions .automation/generated/linter-versions.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"actionlint": "1.7.1",
"ansible-lint": "24.6.1",
"ansible-lint": "24.7.0",
"arm-ttk": "0.0.0",
"bandit": "1.7.9",
"bash-exec": "5.2.26",
"bicep_linter": "0.28.1",
"black": "24.4.2",
"cfn-lint": "1.5.2",
"cfn-lint": "1.6.1",
"checkmake": "0.2.0",
"checkov": "3.2.179",
"checkov": "3.2.189",
"checkstyle": "10.17.0",
"chktex": "1.7.8",
"clang-format": "17.0.6",
Expand All @@ -25,7 +25,7 @@
"djlint": "1.34.1",
"dockerfilelint": "1.8.0",
"dotenv-linter": "3.3.0",
"dotnet-format": "8.0.106",
"dotnet-format": "8.0.107",
"dustilock": "1.2.0",
"editorconfig-checker": "3.0.3",
"eslint": "8.57.0",
Expand Down Expand Up @@ -70,22 +70,22 @@
"pmd": "7.3.0",
"powershell": "7.4.2",
"powershell_formatter": "7.4.2",
"prettier": "3.3.2",
"prettier": "3.3.3",
"proselint": "0.14.0",
"protolint": "0.50.3",
"psalm": "Psalm.5.25.0@",
"puppet-lint": "4.2.4",
"pylint": "3.2.5",
"pyright": "1.1.370",
"pyright": "1.1.371",
"raku": "2020.10",
"remark-lint": "14.0.2",
"revive": "1.3.7",
"roslynator": "0.8.9.0",
"rst-lint": "1.4.0",
"rstcheck": "6.2.4",
"rstfmt": "0.0.14",
"rubocop": "1.64.1",
"ruff": "0.5.1",
"rubocop": "1.65.0",
"ruff": "0.5.2",
"scalafix": "0.12.1",
"scss-lint": "0.60.0",
"secretlint": "8.2.4",
Expand All @@ -102,9 +102,9 @@
"sql-lint": "1.0.0",
"sqlfluff": "3.1.0",
"standard": "17.1.0",
"stylelint": "16.6.1",
"stylelint": "16.7.0",
"swiftlint": "0.55.1",
"syft": "1.8.0",
"syft": "1.9.0",
"tekton-lint": "1.1.0",
"terraform-fmt": "1.9.1",
"terragrunt": "0.60.0",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-ALPHA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
########################################################
# Publish updated version of mega-linter-runner on NPM #
########################################################
- uses: actions/[email protected].2
- uses: actions/[email protected].3
with:
node-version: "18.x"
registry-url: "https://registry.npmjs.org"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-BETA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
########################################################
# Publish updated version of mega-linter-runner on NPM #
########################################################
- uses: actions/[email protected].2
- uses: actions/[email protected].3
with:
node-version: "18.x"
registry-url: "https://registry.npmjs.org"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-DEV.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ jobs:
# Test mega-linter-runner with newly created image
- name: Setup Node
if: ${{ steps.docker_build.outcome }} == 'success' && !contains(github.event.head_commit.message, 'quick build')
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
node-version: "18.x"
- name: Install NPM dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-RELEASE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
########################################################
# Publish updated version of mega-linter-runner on NPM #
########################################################
- uses: actions/[email protected].2
- uses: actions/[email protected].3
with:
node-version: "18.x"
registry-url: "https://registry.npmjs.org"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-mega-linter-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v4
- name: Setup Node
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
node-version: "18.x"
- name: Install dependencies
Expand Down
2 changes: 2 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# .NET sdk
CVE-2024-0057
CVE-2024-30105
CVE-2024-38095

# Devskim
CVE-2018-8292
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,18 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
- [cfn-lint](https://github.com/aws-cloudformation/cfn-lint) from 1.5.1 to **1.5.2** on 2024-07-09
- [checkov](https://www.checkov.io/) from 3.2.177 to **3.2.179** on 2024-07-09
- [snakemake](https://snakemake.readthedocs.io/en/stable/) from 8.15.2 to **8.16.0** on 2024-07-09
- [ansible-lint](https://ansible-lint.readthedocs.io/) from 24.6.1 to **24.7.0** on 2024-07-14
- [cfn-lint](https://github.com/aws-cloudformation/cfn-lint) from 1.5.2 to **1.6.1** on 2024-07-14
- [dotnet-format](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-format) from 8.0.106 to **8.0.107** on 2024-07-14
- [stylelint](https://stylelint.io) from 16.6.1 to **16.7.0** on 2024-07-14
- [prettier](https://prettier.io/) from 3.3.2 to **3.3.3** on 2024-07-14
- [pyright](https://github.com/Microsoft/pyright) from 1.1.370 to **1.1.371** on 2024-07-14
- [ruff](https://github.com/astral-sh/ruff) from 0.5.1 to **0.5.2** on 2024-07-14
- [checkov](https://www.checkov.io/) from 3.2.179 to **3.2.189** on 2024-07-14
- [syft](https://github.com/anchore/syft) from 1.8.0 to **1.9.0** on 2024-07-14
- [rubocop](https://rubocop.org/) from 1.64.1 to **1.65.0** on 2024-07-14
- [vale](https://vale.sh/) from 3.6.0 to **3.6.1** on 2024-07-14
- [vale](https://vale.sh/) from 3.6.1 to **3.6.0** on 2024-07-14
<!-- linter-versions-end -->

## [v7.13.0] - 2024-07-06
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ ARG SALESFORCE_CLI_VERSION=2.48.6
# renovate: datasource=npm depName=@salesforce/plugin-packaging
ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.7.1
# renovate: datasource=npm depName=sfdx-hardis
ARG SFDX_HARDIS_VERSION=4.44.2
ARG SFDX_HARDIS_VERSION=4.45.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
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 -->
[![Generated by github-dependents-info](https://img.shields.io/static/v1?label=Used%20by&message=2512&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/blob/main/./docs/used-by-stats.md)<!-- gh-dependents-info-used-by-end -->
[![Generated by github-dependents-info](https://img.shields.io/static/v1?label=Used%20by&message=2523&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/blob/main/./docs/used-by-stats.md)<!-- 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 4af02a0

Please sign in to comment.