QD-8184 Bump dependencies

JetBrains · Sep 25, 2024 · 91e5571 · 91e5571
1 parent 763c150
commit 91e5571
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -18,17 +18,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ "next", "2024.2", "2024.1", "2023.3" ]
-        group: [ "default", "more" ]
+        version: [ "next", "2024.2" ]
+        group: [ "default", "more", "clang" ]
         include:
           - version: "next"
             group: "ruby"
-          - version: "next"
-            group: "clang"
-          - version: "2024.1"
-            group: "clang"
-          - version: "2024.2"
-            group: "clang"
     runs-on: ubuntu-latest
     steps:
       - name: Clean up

diff --git a/2024.2/base/cnova.Dockerfile b/2024.2/base/cnova.Dockerfile
@@ -33,9 +33,7 @@ ENV MAKE_VERSION="4.3-4.1"
 # renovate: datasource=repology depName=debian_12/patch versioning=loose
 ENV PATCH_VERSION="2.7.6-7"
 # renovate: datasource=repology depName=debian_12/libc6-dev versioning=loose
-ENV LIBC6_DEV_VERSION="2.36-9+deb12u7"
-# renovate: datasource=repology depName=debian_11/locales versioning=loose
-ENV LOCALES_VERSION="2.36-9+deb12u7"
+ENV LIBC6_DEV_VERSION="2.36-9+deb12u8"
 
 # renovate: datasource=npm depName=eslint
 ENV ESLINT_VERSION="9.8.0"
@@ -76,7 +74,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
         make=$MAKE_VERSION \
         patch=$PATCH_VERSION \
         libc6-dev=$LIBC6_DEV_VERSION \
-        locales=$LOCALES_VERSION && \
+        locales=$LIBC6_DEV_VERSION && \
     echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen && \
     apt-get autoremove -y && apt-get clean && \
     chmod 777 -R $HOME && \

diff --git a/next/base/cnova.Dockerfile b/next/base/cnova.Dockerfile
@@ -33,9 +33,7 @@ ENV MAKE_VERSION="4.3-4.1"
 # renovate: datasource=repology depName=debian_12/patch versioning=loose
 ENV PATCH_VERSION="2.7.6-7"
 # renovate: datasource=repology depName=debian_12/libc6-dev versioning=loose
-ENV LIBC6_DEV_VERSION="2.36-9+deb12u7"
-# renovate: datasource=repology depName=debian_11/locales versioning=loose
-ENV LOCALES_VERSION="2.36-9+deb12u7"
+ENV LIBC6_DEV_VERSION="2.36-9+deb12u8"
 
 # renovate: datasource=npm depName=eslint
 ENV ESLINT_VERSION="9.11.0"
@@ -76,7 +74,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
         make=$MAKE_VERSION \
         patch=$PATCH_VERSION \
         libc6-dev=$LIBC6_DEV_VERSION \
-        locales=$LOCALES_VERSION && \
+        locales=$LIBC6_DEV_VERSION && \
     echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen && \
     apt-get autoremove -y && apt-get clean && \
     chmod 777 -R $HOME && \