From d1d341789ea9cf5144a8211de90dbbd02750ec94 Mon Sep 17 00:00:00 2001 From: nvuillam Date: Sun, 21 Aug 2022 13:16:38 +0200 Subject: [PATCH] Add makefile linter within python flavor Fixes https://github.com/oxsecurity/megalinter/issues/1760 --- CHANGELOG.md | 1 + flavors/python/Dockerfile | 6 ++++++ flavors/python/flavor.json | 1 + megalinter/descriptors/all_flavors.json | 1 + megalinter/descriptors/makefile.megalinter-descriptor.yml | 1 + 5 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b149988ec85..348a957c552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l - Fix version in URL in logs produced by reporters - Improve documentation for TAP_REPORTER - Fix flavors suggestions to ignore linters not relevant for such flavor ([#1746](https://github.com/oxsecurity/megalinter/issues/1746)) +- Add Makefile linter within python flavor - 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 diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile index 9835a4117e8..a4532dff264 100644 --- a/flavors/python/Dockerfile +++ b/flavors/python/Dockerfile @@ -221,6 +221,12 @@ RUN ML_THIRD_PARTY_DIR="/third-party/kubeconform" \ && find ${ML_THIRD_PARTY_DIR} -type f -not -name 'LICENSE*' -delete -o -type d -empty -delete +# checkmake installation +RUN ( [ -d /usr/local/bin ] || mkdir -p /usr/local/bin ) \ + && wget -q "https://github.com/mrtazz/checkmake/releases/download/0.2.1/checkmake-0.2.1.linux.amd64" -O /usr/local/bin/checkmake \ + && chmod 755 /usr/local/bin/checkmake + + # protolint installation COPY --from=protolint /usr/local/bin/protolint /usr/bin/ diff --git a/flavors/python/flavor.json b/flavors/python/flavor.json index d9abaa89a78..3b7dec027cc 100644 --- a/flavors/python/flavor.json +++ b/flavors/python/flavor.json @@ -28,6 +28,7 @@ "KOTLIN_KTLINT", "KUBERNETES_KUBEVAL", "KUBERNETES_KUBECONFORM", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_LINK_CHECK", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", diff --git a/megalinter/descriptors/all_flavors.json b/megalinter/descriptors/all_flavors.json index 080b5e52398..dce880fb71a 100644 --- a/megalinter/descriptors/all_flavors.json +++ b/megalinter/descriptors/all_flavors.json @@ -420,6 +420,7 @@ "KOTLIN_KTLINT", "KUBERNETES_KUBEVAL", "KUBERNETES_KUBECONFORM", + "MAKEFILE_CHECKMAKE", "MARKDOWN_MARKDOWNLINT", "MARKDOWN_MARKDOWN_LINK_CHECK", "MARKDOWN_MARKDOWN_TABLE_FORMATTER", diff --git a/megalinter/descriptors/makefile.megalinter-descriptor.yml b/megalinter/descriptors/makefile.megalinter-descriptor.yml index 7ae10a8d261..4a31b163120 100644 --- a/megalinter/descriptors/makefile.megalinter-descriptor.yml +++ b/megalinter/descriptors/makefile.megalinter-descriptor.yml @@ -4,6 +4,7 @@ descriptor_flavors: - all # Applicable to CI in any language project - ci_light - dotnet + - python file_names_regex: - "Makefile" test_folder: makefile