Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #3452 - Update clang-format docs #3453

Merged
merged 2 commits into from
Mar 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
- New linters

- Fixes
- Fix clang-format documentation links to point to the correct version. Fixes [#3452](https://github.com/oxsecurity/megalinter/issues/3452)
- Fix conflict between prettier and yamllint about spaces
- Ensure [trufflehog](https://github.com/trufflesecurity/trufflehog) does not auto-update itself
- Salesforce linters: use sf + default Flow Scanner rules
Expand Down
8 changes: 4 additions & 4 deletions megalinter/descriptors/c.megalinter-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ linters:
name: C_CLANG_FORMAT
descriptor_flavors:
- c_cpp
linter_url: https://releases.llvm.org/16.0.0/tools/clang/docs/ClangFormat.html
linter_url: https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormat.html
linter_repo: https://github.com/llvm/llvm-project
linter_rules_url: https://releases.llvm.org/16.0.0/tools/clang/docs/ClangFormat.html
linter_rules_inline_disable_url: https://releases.llvm.org/16.0.0/tools/clang/docs/ClangFormatStyleOptions.html#disabling-formatting-on-a-piece-of-code
linter_rules_url: https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormat.html
linter_rules_inline_disable_url: https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormatStyleOptions.html#disabling-formatting-on-a-piece-of-code
cli_lint_mode: list_of_files
cli_help_arg_name: "--help"
cli_lint_extra_args:
Expand All @@ -58,4 +58,4 @@ linters:
url: https://marketplace.visualstudio.com/items?itemName=xaver.clang-format
emacs:
- name: clang-format
url: https://releases.llvm.org/16.0.0/tools/clang/docs/ClangFormat.html#emacs-integration
url: https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormat.html#emacs-integration
8 changes: 4 additions & 4 deletions megalinter/descriptors/cpp.megalinter-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ linters:
name: CPP_CLANG_FORMAT
descriptor_flavors:
- c_cpp
linter_url: https://releases.llvm.org/16.0.0/tools/clang/docs/ClangFormat.html
linter_url: https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormat.html
linter_repo: https://github.com/llvm/llvm-project
linter_rules_url: https://releases.llvm.org/16.0.0/tools/clang/docs/ClangFormat.html
linter_rules_inline_disable_url: https://releases.llvm.org/16.0.0/tools/clang/docs/ClangFormatStyleOptions.html#disabling-formatting-on-a-piece-of-code
linter_rules_url: https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormat.html
linter_rules_inline_disable_url: https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormatStyleOptions.html#disabling-formatting-on-a-piece-of-code
cli_lint_mode: list_of_files
cli_help_arg_name: "--help"
cli_lint_extra_args:
Expand All @@ -68,4 +68,4 @@ linters:
url: https://marketplace.visualstudio.com/items?itemName=xaver.clang-format
emacs:
- name: clang-format
url: https://releases.llvm.org/16.0.0/tools/clang/docs/ClangFormat.html#emacs-integration
url: https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormat.html#emacs-integration
Loading