From 311b7c21ba8041f73b0a169b69146a78a9b484bf Mon Sep 17 00:00:00 2001 From: nvuillam Date: Wed, 17 Aug 2022 11:55:11 +0200 Subject: [PATCH 1/5] Fixes swiftlint path argument --- megalinter/descriptors/swift.megalinter-descriptor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/megalinter/descriptors/swift.megalinter-descriptor.yml b/megalinter/descriptors/swift.megalinter-descriptor.yml index b7c6627e12a..91abcbb896f 100644 --- a/megalinter/descriptors/swift.megalinter-descriptor.yml +++ b/megalinter/descriptors/swift.megalinter-descriptor.yml @@ -19,7 +19,7 @@ linters: - "lint" cli_lint_extra_args_after: - "--path" - - "/tmp/lint" + - "{{WORKSPACE}}/tmp/lint" - "--strict" cli_lint_fix_arg_name: "--fix" cli_lint_fix_remove_args: From d6a62e4e492825518f69cc4e638ce625e606199b Mon Sep 17 00:00:00 2001 From: nvuillam Date: Wed, 17 Aug 2022 11:55:57 +0200 Subject: [PATCH 2/5] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24f2733bb06..4c19fab0244 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l - Update pre-commit hooks from v5 to v6 ([#1755](https://github.com/oxsecurity/megalinter/issues/1755)). - Fix version in URL in logs produced by reporters - Improve documentation for TAP_REPORTER +- Fix swiftlint --path argument by adding workspace - Linter versions upgrades - [eslint-plugin-jsonc](https://ota-meshi.github.io/eslint-plugin-jsonc/) from 2.3.1 to **2.4.0** on 2022-08-16 From b24b7901f17bf3a82f298c3733564992343c47cf Mon Sep 17 00:00:00 2001 From: nvuillam Date: Wed, 17 Aug 2022 13:42:24 +0200 Subject: [PATCH 3/5] try something else --- megalinter/descriptors/swift.megalinter-descriptor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/megalinter/descriptors/swift.megalinter-descriptor.yml b/megalinter/descriptors/swift.megalinter-descriptor.yml index 91abcbb896f..f2e591c54b8 100644 --- a/megalinter/descriptors/swift.megalinter-descriptor.yml +++ b/megalinter/descriptors/swift.megalinter-descriptor.yml @@ -18,8 +18,6 @@ linters: cli_lint_extra_args: - "lint" cli_lint_extra_args_after: - - "--path" - - "{{WORKSPACE}}/tmp/lint" - "--strict" cli_lint_fix_arg_name: "--fix" cli_lint_fix_remove_args: @@ -27,7 +25,7 @@ linters: cli_docker_image: norionomura/swiftlint cli_docker_args: - "-v" - - "{{WORKSPACE}}:/tmp/lint:rw" + - "{{WORKSPACE}}:`pwd`:rw" config_file_name: ".swiftlint.yml" cli_config_arg_name: "" cli_help_arg_name: "help" From d5b20cdab44397a22e17a6ef96efd07b9ab6d360 Mon Sep 17 00:00:00 2001 From: nvuillam Date: Wed, 17 Aug 2022 16:19:50 +0200 Subject: [PATCH 4/5] Try again --- megalinter/descriptors/swift.megalinter-descriptor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/megalinter/descriptors/swift.megalinter-descriptor.yml b/megalinter/descriptors/swift.megalinter-descriptor.yml index f2e591c54b8..c7c5155e292 100644 --- a/megalinter/descriptors/swift.megalinter-descriptor.yml +++ b/megalinter/descriptors/swift.megalinter-descriptor.yml @@ -25,7 +25,9 @@ linters: cli_docker_image: norionomura/swiftlint cli_docker_args: - "-v" - - "{{WORKSPACE}}:`pwd`:rw" + - "$(pwd):$(pwd)" + - "-w" + - "$(pwd)" config_file_name: ".swiftlint.yml" cli_config_arg_name: "" cli_help_arg_name: "help" From 375e155936ac40720e4b746f606d05c109bc9888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:00:21 -0400 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc029721041..f4e54fef8c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l - Salesforce linters: Switch sfdx-cli to @salesforce/cli - Fixed issue with `actionlint` throwing an error on `if` statements in the generated workflow file - Added default `.devskim.json` to mitigate errors introduced when no config exists + - Fix swiftlint --path argument by adding workspace - Doc - Display list of articles from newest to oldest @@ -1388,7 +1389,6 @@ _Note: MegaLinter 6.9.0 release has been cancelled: it was fine but the docker i - Add Makefile linter within python flavor ([#1760](https://github.com/oxsecurity/megalinter/issues/1760)) - Set DEFAULT_WORKSPACE as git safe directory per default [#1766](https://github.com/oxsecurity/megalinter/issues/1766) - Improve documentation for TAP_REPORTER -- Fix swiftlint --path argument by adding workspace - Linter versions upgrades - [actionlint](https://rhysd.github.io/actionlint/) from 1.6.15 to **1.6.16**