Skip to content

Commit 9b64814

Browse files
committed
apacheGH-44950: [C++] Bump minimum CMake version to 3.25
Try installing CMake 3.25 manually on Ubuntu Install cmake in linux-apt-lint.dockerfile and update install_cmake.sh to not require platform argument Install CMake 3.25.0 on several Ubuntu jobs and Windows jobs that require the existing version to be bumped Several fixes to install_cmake Some more fixes and upgrade minimal examples to use Ubuntu 24.04 Some more fixes for R Update from CMAKE to CMAKE_VERSION Ensure that versions returned are strings, bump cmake download Try forcing MINGW package to pull a newer CMake Revert trying to pull newer CMake Try to completely remove mingw CMake from CRAN /c/cmake/bin/cmake.exe should be present and in path, try with .exe Try with full path for CMake Try removing manual installation of CMake and installing CMake via pacman before setting up RTools Remove manual Installation of CMake from pacman not present More tries Temporarily try using msys2 GH action to install cmake Remove CMake from PKGBUILD CMake should be in the path Debug new CMake location Try with C:\Program Files\CMake\bin\cmake.exe Just testing at this point Bundle AWSSDK under RTools (#90) Check for mingw Check Windows compiler Try modifying patch due to redefinition Try fixing patch AWS is bundled on Windows R now, do not use MSYS libraries Fix license header on patch + add CMake condition for AWS patch Update configure.win to remove specific AWS CPP libs Update r/configure.win Co-authored-by: Bryce Mecum <[email protected]> Update r/configure.win Test turning ccache back on Update ci/scripts/r_windows_build.sh Co-authored-by: Neal Richardson <[email protected]> Update r/configure.win Co-authored-by: Neal Richardson <[email protected]> Review comments Remove MSYS2_ARG_CONV_EXCL Testing with manually adding missing rtools40 Add correct slash for path Add comment on why MSYS2_ARG_CONV_EXCL is required Use MSYS2_ARG_CONV_EXCL on the same CMake command Update tutorial examples to use a newer Ubuntu Add CMAKE_VERSION to cuda jobs Upgrade minimal Ubuntu to use 24.04 instead of 22.04 Fix minimal build for Ubuntu 24.04 ubuntu-cuda-cpp requires cmake argument Add cmake to docker-compose.yml missing images Add missing cmake to some more images Some more fixing mainly for R binary jobs Set CMAKE to newly installed path Revert "Try modifying patch due to redefinition" This reverts commit b772b23. Reapply "Try modifying patch due to redefinition" This reverts commit 1d71375. Hardcode enum value I tried to find a proper way to include-guard this but everything I tried didn't work. Remove outdated refs to aws libs Since we are bundling these we don't have these to copy Move _WIN32_WINNT def into {c,cxx}flags Ignore warnings-as-errors in cmake
1 parent 1a01b40 commit 9b64814

36 files changed

Lines changed: 516 additions & 59 deletions

‎.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ UBUNTU=22.04
5454

5555
# Default versions for various dependencies
5656
CLANG_TOOLS=14
57+
CMAKE_VERSION=3.25.0
5758
CUDA=11.2.2
5859
DASK=latest
5960
DOTNET=8.0

‎.github/workflows/cpp.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ jobs:
165165
with:
166166
fetch-depth: 0
167167
submodules: recursive
168+
- name: Install CMake 3.25.0
169+
shell: bash
170+
run: |
171+
ci/scripts/install_cmake.sh 3.25.0 /tmp/local/
172+
echo "/tmp/local/bin" >> $GITHUB_PATH
168173
- name: Check CMake presets
169174
run: |
170175
cd cpp
@@ -324,6 +329,11 @@ jobs:
324329
with:
325330
fetch-depth: 0
326331
submodules: recursive
332+
- name: Install CMake 3.25.0
333+
shell: bash
334+
run: |
335+
ci/scripts/install_cmake.sh 3.25.0 /c/cmake
336+
echo "c:\\cmake\\bin" >> $GITHUB_PATH
327337
- name: Download Timezone Database
328338
shell: bash
329339
run: ci/scripts/download_tz_database.sh

‎.github/workflows/dev.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ jobs:
5353
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
5454
with:
5555
python-version: 3.12
56+
- name: Install CMake 3.25.0
57+
shell: bash
58+
run: |
59+
ci/scripts/install_cmake.sh 3.25.0 /tmp/local/
60+
echo "/tmp/local/bin" >> $GITHUB_PATH
5661
- name: Install pre-commit
5762
run: |
5863
python -m pip install pre-commit

‎.github/workflows/r.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,12 @@ jobs:
282282
restore-keys: |
283283
r-${{ matrix.config.rtools }}-ccache-mingw-${{ matrix.config.arch }}-${{ hashFiles('cpp/src/**/*.cc','cpp/src/**/*.h)') }}-
284284
r-${{ matrix.config.rtools }}-ccache-mingw-${{ matrix.config.arch }}-
285+
- name: Install CMake via MSYS2
286+
uses: msys2/setup-msys2@v2
287+
with:
288+
msystem: UCRT64
289+
update: true
290+
install: mingw-w64-ucrt-x86_64-cmake
285291
- uses: r-lib/actions/setup-r@v2
286292
with:
287293
# Note: RTools must be 40 here because RTools40 + ucrt is how we build the Arrow C++

‎ci/docker/centos-7-cpp.dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ RUN \
3737
-e 's/mirror\.centos\.org/vault.centos.org/' \
3838
/etc/yum.repos.d/CentOS-SCLo-scl*.repo && \
3939
yum install -y \
40-
cmake3 \
4140
curl \
4241
devtoolset-8 \
4342
diffutils \
@@ -49,9 +48,13 @@ RUN \
4948
wget \
5049
which
5150

51+
ARG cmake
52+
COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
53+
RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
54+
5255
COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
5356
RUN bash /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
5457

5558
ENV \
5659
ARROW_R_DEV=TRUE \
57-
CMAKE=/usr/bin/cmake3
60+
CMAKE=/usr/local/bin/cmake

‎ci/docker/linux-r.dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ RUN /arrow/ci/scripts/r_docker_configure.sh
5151
COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
5252
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
5353

54+
ARG cmake
55+
COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
56+
RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
57+
5458
COPY ci/scripts/r_deps.sh /arrow/ci/scripts/
5559
COPY r/DESCRIPTION /arrow/r/
5660
RUN /arrow/ci/scripts/r_deps.sh /arrow

‎ci/docker/python-wheel-manylinux.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ENV PATH=/opt/python/${CPYTHON_VERSION}-${CPYTHON_VERSION}/bin:${PATH}
5353
# Install CMake
5454
ARG cmake=3.29.2
5555
COPY ci/scripts/install_cmake.sh arrow/ci/scripts/
56-
RUN /arrow/ci/scripts/install_cmake.sh ${arch} linux ${cmake} /usr/local
56+
RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local
5757

5858
# Install Ninja
5959
ARG ninja=1.10.2

‎ci/docker/ubuntu-20.04-cpp-minimal.dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ RUN apt-get update -y -q && \
2727
apt-get install -y -q \
2828
build-essential \
2929
ccache \
30-
cmake \
3130
curl \
3231
gdb \
3332
git \
@@ -68,6 +67,10 @@ RUN latest_system_llvm=10 && \
6867
apt-get clean && \
6968
rm -rf /var/lib/apt/lists*
7069

70+
ARG cmake
71+
COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
72+
RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
73+
7174
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
7275
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
7376

‎ci/docker/ubuntu-20.04-cpp.dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ RUN apt-get update -y -q && \
6767
autoconf \
6868
ca-certificates \
6969
ccache \
70-
cmake \
7170
curl \
7271
g++ \
7372
gcc \
@@ -121,6 +120,10 @@ RUN apt-get update -y -q && \
121120
apt-get clean && \
122121
rm -rf /var/lib/apt/lists*
123122

123+
ARG cmake
124+
COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
125+
RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
126+
124127
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
125128
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
126129

‎ci/docker/ubuntu-22.04-cpp-minimal.dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ RUN latest_system_llvm=14 && \
6868
apt-get clean && \
6969
rm -rf /var/lib/apt/lists*
7070

71+
ARG cmake
72+
COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
73+
RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
74+
7175
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
7276
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
7377

0 commit comments

Comments
 (0)