Several fixes to install_cmake

apache · Dec 10, 2024 · d283042 · d283042
1 parent 7cf1802
commit d283042
Show file tree

Hide file tree

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

diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -159,11 +159,6 @@ jobs:
           sudo apt update
           sudo apt install -y --no-install-recommends python3 python3-dev python3-pip
           python3 -m pip install -U pip
-      - name: Install CMake 3.25.0
-        shell: bash
-        run: |
-          ci/scripts/install_cmake.sh $(arch) 3.25.0 /tmp/local/
-          echo "/tmp/local/bin" >> $GITHUB_PATH
       - name: Setup Archery
         run: python3 -m pip install -e dev/archery[docker]
       - name: Execute Docker Build
@@ -201,7 +196,7 @@ jobs:
       - name: Install CMake 3.25.0
         shell: bash
         run: |
-          ci/scripts/install_cmake.sh $(arch) 3.25.0 /tmp/local/
+          ci/scripts/install_cmake.sh 3.25.0 /tmp/local/
           echo "/tmp/local/bin" >> $GITHUB_PATH
       - name: Check CMake presets
         run: |
@@ -365,7 +360,7 @@ jobs:
       - name: Install CMake 3.25.0
         shell: bash
         run: |
-          ci/scripts/install_cmake.sh amd64 3.25.0 /c/cmake
+          ci/scripts/install_cmake.sh 3.25.0 /c/cmake
           echo "c:\\cmake\\bin" >> $GITHUB_PATH
       - name: Download Timezone Database
         shell: bash

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Install CMake 3.25.0
         shell: bash
         run: |
-          ci/scripts/install_cmake.sh $(arch) 3.25.0 /tmp/local/
+          ci/scripts/install_cmake.sh 3.25.0 /tmp/local/
           echo "/tmp/local/bin" >> $GITHUB_PATH
       - name: Install pre-commit
         run: |

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -93,11 +93,6 @@ jobs:
         uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: 3.12
-      - name: Install CMake 3.25.0
-        shell: bash
-        run: |
-          ci/scripts/install_cmake.sh $(arch) 3.25.0 /tmp/local/
-          echo "/tmp/local/bin" >> $GITHUB_PATH
       - name: Setup Archery
         run: pip install -e dev/archery[docker]
       - name: Execute Docker Build

diff --git a/ci/docker/linux-apt-lint.dockerfile b/ci/docker/linux-apt-lint.dockerfile
@@ -66,11 +66,6 @@ COPY --from=hadolint /bin/hadolint /usr/bin/hadolint
 COPY ci/scripts/install_iwyu.sh /arrow/ci/scripts/
 RUN arrow/ci/scripts/install_iwyu.sh /tmp/iwyu /usr/local ${clang_tools}
 
-# Update CMake
-ARG cmake=3.25.0
-COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
-RUN /arrow/ci/scripts/install_cmake.sh $(arch) ${cmake} /usr/local/
-
 # Use python3 by default in scripts
 RUN ln -s /usr/bin/python3 /usr/local/bin/python
 

diff --git a/ci/docker/python-wheel-manylinux.dockerfile b/ci/docker/python-wheel-manylinux.dockerfile
@@ -53,7 +53,7 @@ ENV PATH=/opt/python/${CPYTHON_VERSION}-${CPYTHON_VERSION}/bin:${PATH}
 # Install CMake
 ARG cmake=3.29.2
 COPY ci/scripts/install_cmake.sh arrow/ci/scripts/
-RUN /arrow/ci/scripts/install_cmake.sh ${arch} ${cmake} /usr/local
+RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local
 
 # Install Ninja
 ARG ninja=1.10.2

diff --git a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile
@@ -27,7 +27,6 @@ RUN apt-get update -y -q && \
     apt-get install -y -q \
         build-essential \
         ccache \
-        cmake \
         curl \
         gdb \
         git \
@@ -68,6 +67,10 @@ RUN latest_system_llvm=10 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
 
+ARG cmake
+COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
+RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
+
 COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
 

diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile
@@ -67,7 +67,6 @@ RUN apt-get update -y -q && \
         autoconf \
         ca-certificates \
         ccache \
-        cmake \
         curl \
         g++ \
         gcc \
@@ -120,6 +119,10 @@ RUN apt-get update -y -q && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
 
+ARG cmake
+COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
+RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
+
 COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
 

diff --git a/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile b/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile
@@ -68,6 +68,10 @@ RUN latest_system_llvm=14 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
 
+ARG cmake
+COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
+RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
+
 COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
 

diff --git a/ci/docker/ubuntu-22.04-cpp.dockerfile b/ci/docker/ubuntu-22.04-cpp.dockerfile
@@ -71,7 +71,6 @@ RUN apt-get update -y -q && \
         ceph \
         ceph-fuse \
         ceph-mds \
-        cmake \
         curl \
         gdb \
         git \
@@ -172,6 +171,10 @@ RUN if [ "${gcc_version}" = "" ]; then \
 # make sure zlib is cached in the EMSDK folder
 RUN source ~/emsdk/emsdk_env.sh && embuilder --pic build zlib
 
+ARG cmake
+COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
+RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
+
 COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
 

diff --git a/ci/scripts/install_cmake.sh b/ci/scripts/install_cmake.sh
@@ -17,28 +17,32 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -ex
+
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <version> <prefix>"
+  exit 1
+fi
 
 declare -A archs
-archs=([amd64]=x86_64
-       [arch64]=aarch64
+archs=([x86_64]=x86_64
        [arm64]=aarch64
-       [arm64v8]=aarch64
-       [x86_64]=x86_64)
+       [aarch64]=aarch64)
+
+arch=$(uname -m)
+if [ -z ${archs[$arch]} ]; then
+  echo "Unsupported architecture: ${arch}"
+  exit 0
+fi
+arch=${archs[$arch]}
 
 declare -A platforms
 platforms=([linux]=linux
            [macos]=macos
            [windows]=windows)
 
-if [ "$#" -ne 3 ]; then
-  echo "Usage: $0 <architecture> <version> <prefix>"
-  exit 1
-fi
-
-arch=${archs[$1]}
-version=$2
-prefix=$3
+version=$1
+prefix=$2
 
 platform=$(uname)
 case ${platform} in

diff --git a/dev/tasks/python-wheels/github.osx.yml b/dev/tasks/python-wheels/github.osx.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Install CMake 3.29.0
         shell: bash
         run: |
-          arrow/ci/scripts/install_cmake.sh $(arch) 3.29.0 ${PWD}/local
+          arrow/ci/scripts/install_cmake.sh 3.29.0 ${PWD}/local
           echo "${PWD}/local/bin" >> $GITHUB_PATH
 
       - name: Retrieve VCPKG version from arrow/.env

diff --git a/dev/tasks/vcpkg-tests/github.windows.yml b/dev/tasks/vcpkg-tests/github.windows.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Install CMake 3.29.0
         shell: bash
         run: |
-          arrow/ci/scripts/install_cmake.sh amd64 3.29.0 /c/cmake
+          arrow/ci/scripts/install_cmake.sh 3.29.0 /c/cmake
           echo "c:\\cmake\\bin" >> $GITHUB_PATH
       - name: Download Timezone Database
         shell: bash

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -389,6 +389,7 @@ services:
         arch: ${ARCH}
         base: "${ARCH}/ubuntu:${UBUNTU}"
         clang_tools: ${CLANG_TOOLS}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
         gcc_version: ${GCC_VERSION}
     shm_size: *shm-size