Skip to content

Commit be3b53a

Browse files
committed
Unpin CMake version in MSVC toolchain builds now that 3.9.1 is in conda-forge
Change-Id: Iae4737e6cc41494a491dbc8debc771c6aa69d498
1 parent 2c3a5f4 commit be3b53a

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

ci/msvc-build.bat

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,11 @@ conda create -n arrow -q -y python=%PYTHON% ^
5151
six pytest setuptools numpy pandas cython ^
5252
thrift-cpp
5353

54-
@rem ARROW-1294 CMake 3.9.0 in conda-forge breaks the build
55-
set ARROW_CMAKE_VERSION=3.8.0
56-
5754
if "%JOB%" == "Toolchain" (
5855

5956
conda install -n arrow -q -y -c conda-forge ^
6057
flatbuffers rapidjson ^
61-
cmake=%ARROW_CMAKE_VERSION% ^
58+
cmake ^
6259
git ^
6360
boost-cpp ^
6461
snappy zlib brotli gflags lz4-c zstd

dev/release/verify-release-candidate.bat

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@
2020
@rem libray build rem dependencies if you want to build them from source as well
2121
@rem
2222

23-
@rem ARROW-1294 CMake 3.9.0 in conda-forge breaks the build
24-
@rem set ARROW_CMAKE_VERSION=3.8.0
2523
@rem set PYTHON=3.6
2624
@rem conda create -n arrow-verify-release -f -q -y python=%PYTHON%
2725
@rem conda install -y ^
2826
@rem six pytest setuptools numpy pandas cython ^
2927
@rem thrift-cpp flatbuffers rapidjson ^
30-
@rem cmake=%ARROW_CMAKE_VERSION% ^
28+
@rem cmake ^
3129
@rem git ^
3230
@rem boost-cpp ^
3331
@rem snappy zlib brotli gflags lz4-c zstd || exit /B

0 commit comments

Comments
 (0)