Merge remote-tracking branch 'origin/candidate-9.4.x' into candidate-…

…9.6.x Signed-off-by: Jake Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # version.cmake
hpcc-systems · Dec 3, 2024 · 72b3f22 · 72b3f22
2 parents 7f3f269 + 9f92887
commit 72b3f22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmake_modules/commonSetup.cmake b/cmake_modules/commonSetup.cmake
@@ -1075,16 +1075,16 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         list(INSERT ARGS 3 ${ARGV1}_deps)
         if (WIN32)
           install(RUNTIME_DEPENDENCY_SET ${ARGV1}_deps
-            DESTINATION ${EXEC_DIR} 
             PRE_EXCLUDE_REGEXES "api-ms-win-.*\.dll"
             POST_INCLUDE_REGEXES "^${VCPKG_FILES_DIR}.*"
             POST_EXCLUDE_REGEXES ".*"
+            DESTINATION ${EXEC_DIR} 
           )
         else()
           install(RUNTIME_DEPENDENCY_SET ${ARGV1}_deps
-            DESTINATION ${LIB_DIR} 
             POST_INCLUDE_REGEXES "^${VCPKG_FILES_DIR}\/vcpkg_installed\/.*"
             POST_EXCLUDE_REGEXES ".*"
+            DESTINATION ${LIB_DIR} 
           )
         endif()
       endif()

diff --git a/dockerfiles/vcpkg/platform-core-ubuntu-22.04.dockerfile b/dockerfiles/vcpkg/platform-core-ubuntu-22.04.dockerfile
@@ -62,7 +62,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.29.7/b
     chmod +x ./kubectl && \
     mv ./kubectl /usr/local/bin
 
-RUN curl -LO https://packagecloud.io/github/git-lfs/packages/ubuntu/jammy/git-lfs_3.5.1_amd64.deb/download && \
+RUN curl -LO https://packagecloud.io/github/git-lfs/packages/ubuntu/jammy/git-lfs_3.6.0_amd64.deb/download && \
     dpkg -i download && \
     rm download
 

diff --git a/dockerfiles/vcpkg/platform-core-ubuntu-22.04/Dockerfile b/dockerfiles/vcpkg/platform-core-ubuntu-22.04/Dockerfile
@@ -62,7 +62,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.29.7/b
     chmod +x ./kubectl && \
     mv ./kubectl /usr/local/bin
 
-RUN curl -LO https://packagecloud.io/github/git-lfs/packages/ubuntu/jammy/git-lfs_3.5.1_amd64.deb/download && \
+RUN curl -LO https://packagecloud.io/github/git-lfs/packages/ubuntu/jammy/git-lfs_3.6.0_amd64.deb/download && \
     dpkg -i download && \
     rm download