Rever CMAKE_VERSION back to CMAKE on .env

raulcd · Jan 21, 2025 · 5d1c175 · 5d1c175
1 parent 40711bb
commit 5d1c175
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.env b/.env
@@ -54,7 +54,7 @@ UBUNTU=22.04
 
 # Default versions for various dependencies
 CLANG_TOOLS=14
-CMAKE_VERSION=3.25.0
+CMAKE=3.25.0
 CUDA=11.2.2
 DASK=latest
 DOTNET=8.0

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -390,7 +390,7 @@ services:
         arch: ${ARCH}
         base: "${ARCH}/ubuntu:${UBUNTU}"
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         gcc: ${GCC}
         llvm: ${LLVM}
     shm_size: *shm-size
@@ -427,7 +427,7 @@ services:
         arch: ${ARCH}
         base: "${ARCH}/ubuntu:${UBUNTU}"
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         gcc: ${GCC}
         llvm: ${LLVM}
     shm_size: *shm-size
@@ -458,7 +458,7 @@ services:
       cache_from:
         - ${REPO}:centos-7-cpp-static
       args:
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
     shm_size: *shm-size
     volumes:
       - .:/arrow:delegated
@@ -481,7 +481,7 @@ services:
       args:
         arch: ${ARCH}
         base: "${ARCH}/ubuntu:${UBUNTU}"
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
     shm_size: *shm-size
     ulimits: *ulimits
@@ -576,7 +576,7 @@ services:
         arch: ${ARCH}
         base: nvidia/cuda:${CUDA}-devel-ubuntu${UBUNTU}
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
     shm_size: *shm-size
     ulimits: *ulimits
@@ -627,7 +627,7 @@ services:
       args:
         arch: ${ARCH}
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
     shm_size: *shm-size
     volumes: *ubuntu-volumes
@@ -707,7 +707,7 @@ services:
       args:
         arch: ${ARCH}
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
     shm_size: *shm-size
     volumes: *ubuntu-volumes
@@ -1595,7 +1595,7 @@ services:
         tz: ${TZ}
         r_prune_deps: ${R_PRUNE_DEPS}
         r_custom_ccache: ${R_CUSTOM_CCACHE}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
     shm_size: *shm-size
     environment:
       <<: [*common, *sccache]
@@ -1625,7 +1625,7 @@ services:
         - ${REPO}:amd64-ubuntu-20.04-r-sanitizer
       args:
         base: wch1/r-debug:latest
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         r_bin: RDsan
         tz: ${TZ}
         r_prune_deps: ${R_PRUNE_DEPS}
@@ -1646,7 +1646,7 @@ services:
         - ${REPO}:r-rhub-clang-devel-latest
       args:
         base: rhub/clang-asan
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         r_dev: ${ARROW_R_DEV}
         r_bin: R
         tz: ${TZ}
@@ -1678,7 +1678,7 @@ services:
         - ${REPO}:amd64-ubuntu-20.04-r-valgrind
       args:
         base: wch1/r-debug:latest
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         r_bin: RDvalgrind
         tz: ${TZ}
     environment: