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.

Sign up for GitHub

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

Reactivate cljstyle #4369

Merged
merged 3 commits into from
Dec 15, 2024
+26 −5
Merged

Reactivate cljstyle #4369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc8b523
Reactivate cljstyle
nvuillam Dec 9, 2024
2964593
Merge remote-tracking branch 'origin/main' into fixes/cljstyle
nvuillam Dec 15, 2024
2c318bd
build
nvuillam Dec 15, 2024
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 .github/workflows/deploy-BETA-linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
"c_cpplint",
"c_clang_format",
"clojure_clj_kondo",
"clojure_cljstyle",
"cloudformation_cfn_lint",
"coffee_coffeelint",
"copypaste_jscpd",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-DEV-linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
"c_cpplint",
"c_clang_format",
"clojure_clj_kondo",
"clojure_cljstyle",
"cloudformation_cfn_lint",
"coffee_coffeelint",
"copypaste_jscpd",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-RELEASE-linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
"c_cpplint",
"c_clang_format",
"clojure_clj_kondo",
"clojure_cljstyle",
"cloudformation_cfn_lint",
"coffee_coffeelint",
"copypaste_jscpd",
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
#
Expand Down
5 changes: 5 additions & 0 deletions flavors/cupcake/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
1 change: 1 addition & 0 deletions flavors/cupcake/flavor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"BASH_SHFMT",
"C_CPPLINT",
"CLOJURE_CLJ_KONDO",
"CLOJURE_CLJSTYLE",
"CLOUDFORMATION_CFN_LINT",
"COPYPASTE_JSCPD",
"CPP_CPPLINT",
Expand Down
5 changes: 5 additions & 0 deletions flavors/java/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
1 change: 1 addition & 0 deletions flavors/java/flavor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"BASH_SHELLCHECK",
"BASH_SHFMT",
"CLOJURE_CLJ_KONDO",
"CLOJURE_CLJSTYLE",
"COPYPASTE_JSCPD",
"CSS_STYLELINT",
"DOCKERFILE_HADOLINT",
Expand Down
2 changes: 1 addition & 1 deletion linters/clojure_cljstyle/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions megalinter/descriptors/all_flavors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"BASH_SHFMT",
"C_CPPLINT",
"CLOJURE_CLJ_KONDO",
"CLOJURE_CLJSTYLE",
"CLOUDFORMATION_CFN_LINT",
"COPYPASTE_JSCPD",
"CPP_CPPLINT",
Expand Down Expand Up @@ -512,6 +513,7 @@
"BASH_SHELLCHECK",
"BASH_SHFMT",
"CLOJURE_CLJ_KONDO",
"CLOJURE_CLJSTYLE",
"COPYPASTE_JSCPD",
"CSS_STYLELINT",
"DOCKERFILE_HADOLINT",
Expand Down
6 changes: 2 additions & 4 deletions megalinter/descriptors/clojure.megalinter-descriptor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading