Reactivate cljstyle (#4369)

* Reactivate cljstyle

* build

.github/workflows/deploy-BETA-linters.yml

@@ -67,6 +67,7 @@ jobs:
             "c_cpplint",
             "c_clang_format",
             "clojure_clj_kondo",
+            "clojure_cljstyle",
             "cloudformation_cfn_lint",
             "coffee_coffeelint",
             "copypaste_jscpd",

.github/workflows/deploy-DEV-linters.yml

@@ -47,6 +47,7 @@ jobs:
             "c_cpplint",
             "c_clang_format",
             "clojure_clj_kondo",
+            "clojure_cljstyle",
             "cloudformation_cfn_lint",
             "coffee_coffeelint",
             "copypaste_jscpd",

.github/workflows/deploy-RELEASE-linters.yml

@@ -60,6 +60,7 @@ jobs:
             "c_cpplint",
             "c_clang_format",
             "clojure_clj_kondo",
+            "clojure_cljstyle",
             "cloudformation_cfn_lint",
             "coffee_coffeelint",
             "copypaste_jscpd",

CHANGELOG.md

@@ -12,6 +12,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
   - PHP Linters use now the `bartlett/sarif-php-converters` first official release 1.0.0 to generate SARIF reports
 
 - New linters
+  - Reactivate clj-style (Clojure formatter) since its bug is fixed
 
 - Media
 

Dockerfile

@@ -600,6 +600,11 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
     && chmod +x install-clj-kondo \
     && ./install-clj-kondo \
 #
+# cljstyle installation
+    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
+    && chmod +x install-cljstyle \
+    && ./install-cljstyle --static \
+#
 # csharpier installation
     && dotnet tool install --global csharpier \
 #

flavors/cupcake/Dockerfile

@@ -432,6 +432,11 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
     && chmod +x install-clj-kondo \
     && ./install-clj-kondo \
 #
+# cljstyle installation
+    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
+    && chmod +x install-cljstyle \
+    && ./install-cljstyle --static \
+#
 # hadolint installation
 # Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
 #

flavors/cupcake/flavor.json

@@ -17,6 +17,7 @@
         "BASH_SHFMT",
         "C_CPPLINT",
         "CLOJURE_CLJ_KONDO",
+        "CLOJURE_CLJSTYLE",
         "CLOUDFORMATION_CFN_LINT",
         "COPYPASTE_JSCPD",
         "CPP_CPPLINT",

flavors/java/Dockerfile

@@ -332,6 +332,11 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
     && chmod +x install-clj-kondo \
     && ./install-clj-kondo \
 #
+# cljstyle installation
+    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
+    && chmod +x install-cljstyle \
+    && ./install-cljstyle --static \
+#
 # hadolint installation
 # Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
 #

flavors/java/flavor.json

@@ -14,6 +14,7 @@
         "BASH_SHELLCHECK",
         "BASH_SHFMT",
         "CLOJURE_CLJ_KONDO",
+        "CLOJURE_CLJSTYLE",
         "COPYPASTE_JSCPD",
         "CSS_STYLELINT",
         "DOCKERFILE_HADOLINT",

linters/clojure_cljstyle/Dockerfile

@@ -190,7 +190,7 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases
 # cljstyle installation
     && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
     && chmod +x install-cljstyle \
-    && ./install-cljstyle
+    && ./install-cljstyle --static
 
 #
 #OTHER__END

megalinter/descriptors/all_flavors.json

@@ -110,6 +110,7 @@
             "BASH_SHFMT",
             "C_CPPLINT",
             "CLOJURE_CLJ_KONDO",
+            "CLOJURE_CLJSTYLE",
             "CLOUDFORMATION_CFN_LINT",
             "COPYPASTE_JSCPD",
             "CPP_CPPLINT",
@@ -512,6 +513,7 @@
             "BASH_SHELLCHECK",
             "BASH_SHFMT",
             "CLOJURE_CLJ_KONDO",
+            "CLOJURE_CLJSTYLE",
             "COPYPASTE_JSCPD",
             "CSS_STYLELINT",
             "DOCKERFILE_HADOLINT",

megalinter/descriptors/clojure.megalinter-descriptor.yml

@@ -89,8 +89,6 @@ linters:
 
     # cljstyle
   - linter_name: cljstyle
-    disabled: true
-    disabled_reason: "Bug on cljstyle on alpine linux: https://github.com/greglook/cljstyle/issues/104"
     linter_url: https://github.com/greglook/cljstyle
     linter_repo: https://github.com/greglook/cljstyle
     linter_rules_url: https://github.com/greglook/cljstyle/blob/main/doc/configuration.md#format-rules
@@ -110,13 +108,13 @@ linters:
     examples:
       - "cljstyle check"
       - "cljstyle fix"
-      - "clj-kondo fix myfile.clj path/to/myfile.clj"
+      - "cljstyle fix myfile.clj path/to/myfile.clj"
     install:
       dockerfile:
         - |
           RUN curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
               && chmod +x install-cljstyle \
-              && ./install-cljstyle
+              && ./install-cljstyle --static
     ide:
       emacs:
         - name: cljstyle-mode