Skip to content

Commit

Permalink
Merge branch 'main' into rl_add_codespell
Browse files Browse the repository at this point in the history
  • Loading branch information
echoix authored Nov 27, 2024
2 parents 1ff249f + 9b450aa commit 9b04061
Show file tree
Hide file tree
Showing 190 changed files with 479 additions and 388 deletions.
41 changes: 18 additions & 23 deletions .automation/generated/linter-helps.json

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

22 changes: 11 additions & 11 deletions .automation/generated/linter-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"black": "24.10.0",
"cfn-lint": "1.20.0",
"checkmake": "0.2.0",
"checkov": "3.2.311",
"checkov": "3.2.317",
"checkstyle": "10.20.1",
"chktex": "1.7.8",
"clang-format": "17.0.6",
Expand All @@ -18,7 +18,7 @@
"codespell": "2.3.0",
"coffeelint": "5.2.11",
"cpplint": "2.0.0",
"csharpier": "0.30.1",
"csharpier": "0.30.2",
"cspell": "8.16.0",
"dartanalyzer": "0.0.0",
"detekt": "1.23.7",
Expand All @@ -35,7 +35,7 @@
"gherkin-lint": "0.0.0",
"git_diff": "2.45.2",
"gitleaks": "8.21.2",
"golangci-lint": "1.62.0",
"golangci-lint": "1.62.2",
"goodcheck": "3.1.0",
"graphql-schema-linter": "3.0.1",
"grype": "0.79.5",
Expand All @@ -57,21 +57,21 @@
"lychee": "0.17.0",
"markdown-link-check": "3.12.2",
"markdown-table-formatter": "1.6.1",
"markdownlint": "0.42.0",
"markdownlint": "0.43.0",
"misspell": "0.3.4",
"mypy": "1.13.0",
"npm-groovy-lint": "15.0.2",
"npm-package-json-lint": "8.0.0",
"perlcritic": "1.156",
"php": "7.4.26",
"php-cs-fixer": "3.64.0",
"php-cs-fixer": "3.65.0",
"phpcs": "3.11.1",
"phplint": "9.5.4",
"phpstan": "2.0.2",
"pmd": "7.7.0",
"powershell": "7.4.2",
"powershell_formatter": "7.4.2",
"prettier": "3.3.3",
"prettier": "3.4.1",
"proselint": "0.14.0",
"protolint": "0.50.5",
"psalm": "Psalm.5.26.1@",
Expand All @@ -85,8 +85,8 @@
"rst-lint": "1.4.0",
"rstcheck": "6.2.4",
"rstfmt": "0.0.14",
"rubocop": "1.68.0",
"ruff": "0.7.4",
"rubocop": "1.69.0",
"ruff": "0.8.0",
"scalafix": "0.13.0",
"scss-lint": "0.60.0",
"secretlint": "9.0.0",
Expand All @@ -106,16 +106,16 @@
"standard": "17.1.2",
"stylelint": "16.10.0",
"stylua": "2.0.0",
"swiftlint": "0.57.0",
"swiftlint": "0.57.1",
"syft": "1.17.0",
"tekton-lint": "1.1.0",
"terraform-fmt": "1.9.8",
"terragrunt": "0.68.14",
"terragrunt": "0.69.1",
"terrascan": "1.19.9",
"tflint": "0.54.0",
"trivy": "0.57.1",
"trivy-sbom": "0.57.1",
"trufflehog": "3.84.0",
"trufflehog": "3.84.1",
"ts-standard": "12.0.2",
"tsqllint": "1.16.0.0",
"v8r": "4.2.0",
Expand Down
6 changes: 6 additions & 0 deletions .automation/test/pre-post-test/.mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ PRE_COMMANDS:
- command: export MY_OUTPUT_VARIABLE="my output variable value" && export MY_OUTPUT_VARIABLE2="my output variable value2"
output_variables: ["MY_OUTPUT_VARIABLE", "MY_OUTPUT_VARIABLE2"]
cwd: "root"
- command: export MY_OUTPUT_VARIABLE_REPLACED="${MY_INPUT_VARIABLE}"
replacement_env_vars:
- var_src: MY_INPUT_VARIABLE_REPLACEMENT
var_dest: MY_INPUT_VARIABLE
output_variables: ["MY_OUTPUT_VARIABLE_REPLACED"]
cwd: "root"
POST_COMMANDS:
- command: npm run test
cwd: "workspace"
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy-RELEASE-flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,19 @@ jobs:
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter-${{ matrix.flavor }}:v8", "target-image": "docker.io/oxsecurity/megalinter-${{ matrix.flavor }}:v8" }'
ref: main
- name: Invoke Mirror docker image workflow (Main image)
uses: benc-uk/workflow-dispatch@v1
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter-${{ matrix.flavor }}:v8", "target-image": "docker.io/oxsecurity/megalinter-${{ matrix.flavor }}:${{ github.event.release.tag_name }}" }'
ref: main
- name: Invoke Mirror docker image workflow (Main image)
uses: benc-uk/workflow-dispatch@v1
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter-${{ matrix.flavor }}:v8", "target-image": "docker.io/oxsecurity/megalinter-${{ matrix.flavor }}:latest" }'

ref: main
# - name: Build Worker Image
# uses: docker/build-push-action@v6
# with:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/deploy-RELEASE-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
name: release
strategy:
fail-fast: false
max-parallel: 10
matrix:
os: [ubuntu-latest]
# linters-start
Expand Down Expand Up @@ -220,17 +219,19 @@ jobs:
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter-only-${{ matrix.linter }}:v8", "target-image": "docker.io/oxsecurity/megalinter-only-${{ matrix.linter }}:v8" }'
ref: main
- name: Invoke Mirror docker image workflow (Standalone image)
uses: benc-uk/workflow-dispatch@v1
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter-only-${{ matrix.linter }}:v8", "target-image": "docker.io/oxsecurity/megalinter-only-${{ matrix.linter }}:${{ github.event.release.tag_name }}" }'
ref: main
- name: Invoke Mirror docker image workflow (Standalone image)
uses: benc-uk/workflow-dispatch@v1
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter-only-${{ matrix.linter }}:v8", "target-image": "docker.io/oxsecurity/megalinter-only-${{ matrix.linter }}:latest" }'

ref: main
#####################################
# Run Linter test cases #
#####################################
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy-RELEASE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,19 @@ jobs:
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter:v8", "target-image": "docker.io/oxsecurity/megalinter:v8" }'
ref: main
- name: Invoke Mirror docker image workflow (Main image)
uses: benc-uk/workflow-dispatch@v1
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter:v8", "target-image": "docker.io/oxsecurity/megalinter:${{ github.event.release.tag_name }}" }'
ref: main
- name: Invoke Mirror docker image workflow (Main image)
uses: benc-uk/workflow-dispatch@v1
with:
workflow: mirror-docker-image.yml
inputs: '{ "source-image": "ghcr.io/oxsecurity/megalinter:v8", "target-image": "docker.io/oxsecurity/megalinter:latest" }'

ref: main
# - name: Build Worker Image
# uses: docker/build-push-action@v6
# with:
Expand Down
Loading

0 comments on commit 9b04061

Please sign in to comment.