Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
sbkok committed Jul 24, 2023
2 parents 356e087 + 9b8ff6d commit 134b811
Show file tree
Hide file tree
Showing 132 changed files with 1,138 additions and 712 deletions.
2 changes: 2 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
"npm"
],
"ignorePaths": [
".pylintrc",
"requirements.txt",
"requirements-dev.txt",
"maven-wrapper.jar",
".cspell.json",
".gitignore",
Expand Down
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ max_line_length = 80

[*.py]
indent_size = 4
max_line_length = 100

[*.{json,xml,html,ejs}]
indent_size = 4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mega-linter.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# MegaLinter GitHub Action configuration file
# More info at https://oxsecurity.github.io/megalinter
# More info at https://megalinter.io
name: MegaLinter

on: [push, pull_request]
Expand All @@ -27,10 +27,10 @@ jobs:

- name: MegaLinter
id: ml
uses: oxsecurity/megalinter@v6
uses: oxsecurity/megalinter@v7
env:
# All available variables are described in documentation
# https://oxsecurity.github.io/megalinter/configuration/
# https://megalinter.io/configuration/
VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
19 changes: 10 additions & 9 deletions .mega-linter.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Configuration file for MegaLinter
# See all available variables at https://oxsecurity.github.io/megalinter/configuration/ and in linters documentation
# See all available variables at https://megalinter.io/configuration/ and in linters documentation

# all, none, or list of linter keys
APPLY_FIXES: none
Expand All @@ -21,22 +21,18 @@ ENABLE_LINTERS:
- MARKDOWN_MARKDOWNLINT
- MARKDOWN_MARKDOWN_TABLE_FORMATTER
- SPELL_CSPELL
- SPELL_MISSPELL
- TERRAFORM_TFLINT
- YAML_YAMLLINT

# DISABLE:
# - COPYPASTE # Comment to enable checks of excessive copy-pastes
# - SPELL # Comment to enable checks of spelling mistakes

SARIF_REPORTER: true
SHOW_ELAPSED_TIME: true
FILEIO_REPORTER: false
# DISABLE_ERRORS: true # Uncomment if you want MegaLinter to detect errors but not block CI to pass

# Install pluging for list handling.
# Install plugin for list handling.
JSON_PRETTIER_PRE_COMMANDS:
- command: npm install prettier-plugin-multiline-arrays@1.1.0
- command: |
npm install -g prettier-plugin-multiline-arrays@1.1.4
npm install --prefix /node-deps/ prettier-plugin-multiline-arrays@1.1.4
cwd: "workspace"
CLOUDFORMATION_CFN_LINT_CONFIG_FILE: '.cfnlintrc'
Expand All @@ -46,3 +42,8 @@ MARKDOWN_MARKDOWN_LINK_CHECK_ARGUMENTS: '-q'
MARKDOWN_MARKDOWNLINT_DISABLE_ERRORS: false
SPELL_CSPELL_ARGUMENTS: '--gitignore --no-progress --show-suggestions'
SPELL_CSPELL_FILE_EXTENSIONS: ["*"]
TERRAFORM_TFLINT_UNSECURED_ENV_VARIABLES:
- GITHUB_TOKEN

GITHUB_STATUS_REPORTER: true
GITHUB_COMMENT_REPORTER: true
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
plugins: [
'/node-deps/node_modules/prettier-plugin-multiline-arrays'
'prettier-plugin-multiline-arrays'
],
trailingComma: 'es5',
semi: false,
Expand Down
Loading

0 comments on commit 134b811

Please sign in to comment.