Use renovate with clj-style (#4531)

* Use renovate with clj-style * [build-command] Update generated files * Ignore word * Remove static flag * [build-command] Update generated files * Fix installation --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
oxsecurity · Jan 21, 2025 · 65d5ba5 · 65d5ba5
1 parent 879b90a
commit 65d5ba5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -98,6 +98,7 @@
         "gfch",
         "gotit",
         "gouverner",
+        "greglook",
         "has-bigints",
         "has-tostringtag",
         "hiqr",

diff --git a/Dockerfile b/Dockerfile
@@ -126,6 +126,8 @@ ARG BICEP_DIR='/usr/local/bin'
 # renovate: datasource=github-tags depName=clj-kondo/clj-kondo
 ARG CLJ_KONDO_VERSION=2025.01.16
 
+# renovate: datasource=github-tags depName=greglook/cljstyle
+ARG CLJ_STYLE_VERSION=0.17.642
 # renovate: datasource=nuget depName=csharpier
 ARG CSHARP_CSHARPIER_VERSION=0.30.6
 # renovate: datasource=nuget depName=roslynator.dotnet.cli
@@ -618,7 +620,7 @@ RUN curl --retry 5 --retry-delay 5 -sLO "https://github.com/Azure/arm-ttk/releas
 # 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 \
+    && ./install-cljstyle --static --version "$CLJ_STYLE_VERSION" \
 #
 # csharpier installation
     && dotnet tool install --global csharpier --version "${CSHARP_CSHARPIER_VERSION}" \

diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile
@@ -101,6 +101,8 @@ FROM python:3.12.8-alpine3.21
 # renovate: datasource=github-tags depName=clj-kondo/clj-kondo
 ARG CLJ_KONDO_VERSION=2025.01.16
 
+# renovate: datasource=github-tags depName=greglook/cljstyle
+ARG CLJ_STYLE_VERSION=0.17.642
 # renovate: datasource=github-tags depName=pmd/pmd extractVersion=^pmd_releases/(?<version>.*)$
 ARG PMD_VERSION=7.9.0
 
@@ -435,7 +437,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
 # 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 \
+    && ./install-cljstyle --static --version "$CLJ_STYLE_VERSION" \
 #
 # hadolint installation
 # Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint

diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile
@@ -86,6 +86,8 @@ FROM python:3.12.8-alpine3.21
 # renovate: datasource=github-tags depName=clj-kondo/clj-kondo
 ARG CLJ_KONDO_VERSION=2025.01.16
 
+# renovate: datasource=github-tags depName=greglook/cljstyle
+ARG CLJ_STYLE_VERSION=0.17.642
 # renovate: datasource=github-tags depName=pmd/pmd extractVersion=^pmd_releases/(?<version>.*)$
 ARG PMD_VERSION=7.9.0
 
@@ -346,7 +348,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
 # 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 \
+    && ./install-cljstyle --static --version "$CLJ_STYLE_VERSION" \
 #
 # hadolint installation
 # Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint

diff --git a/linters/clojure_cljstyle/Dockerfile b/linters/clojure_cljstyle/Dockerfile
@@ -48,7 +48,8 @@ FROM python:3.12.8-alpine3.21
 ## @generated by .automation/build.py using descriptor files, please do not update manually ##
 #############################################################################################
 #ARG__START
-
+# renovate: datasource=github-tags depName=greglook/cljstyle
+ARG CLJ_STYLE_VERSION=0.17.642
 #ARG__END
 
 ####################
@@ -190,7 +191,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 --static
+    && ./install-cljstyle --static --version "$CLJ_STYLE_VERSION"
 
 #
 #OTHER__END

diff --git a/megalinter/descriptors/clojure.megalinter-descriptor.yml b/megalinter/descriptors/clojure.megalinter-descriptor.yml
@@ -114,10 +114,13 @@ linters:
       - "cljstyle fix myfile.clj path/to/myfile.clj"
     install:
       dockerfile:
+        - |-
+          # renovate: datasource=github-tags depName=greglook/cljstyle
+          ARG CLJ_STYLE_VERSION=0.17.642
         - |
           RUN curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
               && chmod +x install-cljstyle \
-              && ./install-cljstyle --static
+              && ./install-cljstyle --static --version "$CLJ_STYLE_VERSION"
     ide:
       emacs:
         - name: cljstyle-mode