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

Downgrade revive & Temporary disable cljstyle #3268

Merged
merged 5 commits into from
Jan 7, 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: 0 additions & 1 deletion .github/workflows/deploy-BETA-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ jobs:
"c_cpplint",
"c_clang_format",
"clojure_clj_kondo",
"clojure_cljstyle",
"cloudformation_cfn_lint",
"coffee_coffeelint",
"copypaste_jscpd",
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-DEV-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ jobs:
"c_cpplint",
"c_clang_format",
"clojure_clj_kondo",
"clojure_cljstyle",
"cloudformation_cfn_lint",
"coffee_coffeelint",
"copypaste_jscpd",
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-RELEASE-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
"c_cpplint",
"c_clang_format",
"clojure_clj_kondo",
"clojure_cljstyle",
"cloudformation_cfn_lint",
"coffee_coffeelint",
"copypaste_jscpd",
Expand Down
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FROM golang:1-alpine as revive
## The golang image used as a builder is a temporary workaround
## for the released revive binaries not returning version numbers (devel).
## The install command should then be what is commented in the go.megalinter-descriptor.yml
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4

FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
FROM ghcr.io/assignuser/chktex-alpine:latest as chktex
Expand Down Expand Up @@ -526,11 +526,6 @@ 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/script/install-cljstyle \
&& chmod +x install-cljstyle \
&& ./install-cljstyle \

# csharpier installation
&& dotnet tool install --global csharpier \

Expand Down
7 changes: 1 addition & 6 deletions flavors/cupcake/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM golang:1-alpine as revive
## The golang image used as a builder is a temporary workaround
## for the released revive binaries not returning version numbers (devel).
## The install command should then be what is commented in the go.megalinter-descriptor.yml
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4

FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
FROM mrtazz/checkmake:latest as checkmake
Expand Down Expand Up @@ -388,11 +388,6 @@ 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/script/install-cljstyle \
&& chmod +x install-cljstyle \
&& ./install-cljstyle \

# hadolint installation
# Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint

Expand Down
1 change: 0 additions & 1 deletion flavors/cupcake/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"BASH_SHFMT",
"C_CPPLINT",
"CLOJURE_CLJ_KONDO",
"CLOJURE_CLJSTYLE",
"CLOUDFORMATION_CFN_LINT",
"COPYPASTE_JSCPD",
"CPP_CPPLINT",
Expand Down
2 changes: 1 addition & 1 deletion flavors/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM golang:1-alpine as revive
## The golang image used as a builder is a temporary workaround
## for the released revive binaries not returning version numbers (devel).
## The install command should then be what is commented in the go.megalinter-descriptor.yml
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4

FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
FROM mrtazz/checkmake:latest as checkmake
Expand Down
5 changes: 0 additions & 5 deletions flavors/java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,6 @@ 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/script/install-cljstyle \
&& chmod +x install-cljstyle \
&& ./install-cljstyle \

# hadolint installation
# Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint

Expand Down
1 change: 0 additions & 1 deletion flavors/java/flavor.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"BASH_SHELLCHECK",
"BASH_SHFMT",
"CLOJURE_CLJ_KONDO",
"CLOJURE_CLJSTYLE",
"COPYPASTE_JSCPD",
"CSS_STYLELINT",
"CSS_SCSS_LINT",
Expand Down
2 changes: 1 addition & 1 deletion linters/clojure_cljstyle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases
"$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" \

# cljstyle installation
&& curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/script/install-cljstyle \
&& curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
&& chmod +x install-cljstyle \
&& ./install-cljstyle

Expand Down
2 changes: 1 addition & 1 deletion linters/go_revive/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FROM golang:1-alpine as revive
## The golang image used as a builder is a temporary workaround
## for the released revive binaries not returning version numbers (devel).
## The install command should then be what is commented in the go.megalinter-descriptor.yml
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4

#FROM__END

Expand Down
2 changes: 0 additions & 2 deletions megalinter/descriptors/all_flavors.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
"BASH_SHFMT",
"C_CPPLINT",
"CLOJURE_CLJ_KONDO",
"CLOJURE_CLJSTYLE",
"CLOUDFORMATION_CFN_LINT",
"COPYPASTE_JSCPD",
"CPP_CPPLINT",
Expand Down Expand Up @@ -521,7 +520,6 @@
"BASH_SHELLCHECK",
"BASH_SHFMT",
"CLOJURE_CLJ_KONDO",
"CLOJURE_CLJSTYLE",
"COPYPASTE_JSCPD",
"CSS_STYLELINT",
"CSS_SCSS_LINT",
Expand Down
3 changes: 2 additions & 1 deletion megalinter/descriptors/clojure.megalinter-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ linters:

# cljstyle
- linter_name: cljstyle
disabled: true # Disabled until https://github.com/greglook/cljstyle/issues/104 is solved
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 @@ -112,7 +113,7 @@ linters:
install:
dockerfile:
- |
RUN curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/script/install-cljstyle \
RUN curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
&& chmod +x install-cljstyle \
&& ./install-cljstyle
ide:
Expand Down
4 changes: 3 additions & 1 deletion megalinter/descriptors/go.megalinter-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ linters:
examples:
- "revive myfile.go"
- "revive -config myfile.go"
downgraded_version: true
downgraded_reason: https://github.com/mgechev/revive/issues/956
install:
dockerfile:
## Until "FROM ghcr.io/mgechev/revive:1.2.5 as revive" is available, use
Expand All @@ -85,7 +87,7 @@ linters:
## The golang image used as a builder is a temporary workaround
## for the released revive binaries not returning version numbers (devel).
## The install command should then be what is commented in the go.megalinter-descriptor.yml
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4
- COPY --link --from=revive /usr/bin/revive /usr/bin/revive
ide:
atom:
Expand Down
Loading
Loading