@@ -190,10 +190,15 @@ install_ubuntu_prerequisites_template: &INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
190
190
fi
191
191
apt-get -q update
192
192
apt-get -yq install \
193
- git-core cmake ninja-build $gcc_pkg \
193
+ git-core ninja-build $gcc_pkg \
194
194
zlib1g-dev $libcurl_pkg curl gdb python3 python3-pip tzdata unzip zip \
195
195
$EXTRA_APT_PACKAGES
196
196
python3 --version
197
+ # Download & extract CMake
198
+ curl -fL --retry 3 --max-time 300 -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-$CI_ARCH.tar.gz
199
+ mkdir cmake
200
+ tar -xf cmake.tar.gz --strip 1 -C cmake
201
+ rm cmake.tar.gz
197
202
# Download & extract custom Ninja on x86_64
198
203
if [[ "$CI_ARCH" == "x86_64" ]]; then
199
204
curl -fL --retry 3 --max-time 60 -O https://github.com/symmetryinvestments/ninja/releases/download/v1.11.1-sym1/ninja-linux.zip
@@ -214,7 +219,7 @@ install_macos_prerequisites_template: &INSTALL_MACOS_PREREQUISITES_TEMPLATE
214
219
cd $CIRRUS_WORKING_DIR/..
215
220
sysctl -n hw.logicalcpu
216
221
# Download & extract CMake
217
- curl -fL --retry 3 --max-time 300 -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.20.3 /cmake-3.20.3 -macos-universal.tar.gz
222
+ curl -fL --retry 3 --max-time 300 -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.27.1 /cmake-3.27.1 -macos-universal.tar.gz
218
223
mkdir cmake
219
224
tar -xf cmake.tar.gz --strip 3 -C cmake
220
225
rm cmake.tar.gz
@@ -260,7 +265,7 @@ task:
260
265
EXTRA_APT_PACKAGES : " llvm-dev libclang-common-10-dev"
261
266
EXTRA_CMAKE_FLAGS : " -DMULTILIB=ON -DRT_SUPPORT_SANITIZERS=ON -DBUILD_LTO_LIBS=ON"
262
267
PARALLELISM : 8
263
- PATH : ${CIRRUS_WORKING_DIR}/../ninja:${PATH}
268
+ PATH : ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ ninja:${PATH}
264
269
<< : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
265
270
<< : *COMMON_STEPS_TEMPLATE
266
271
@@ -279,7 +284,7 @@ task:
279
284
EXTRA_APT_PACKAGES : " gdmd llvm-dev libclang-common-15-dev"
280
285
EXTRA_CMAKE_FLAGS : " -DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON -DD_COMPILER=gdmd -DLDC_LINK_MANUALLY=ON"
281
286
PARALLELISM : 8
282
- PATH : ${CIRRUS_WORKING_DIR}/../ninja:${PATH}
287
+ PATH : ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ ninja:${PATH}
283
288
# for gdmd:
284
289
LANG : C.UTF-8
285
290
<< : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
@@ -299,7 +304,7 @@ task:
299
304
EXTRA_APT_PACKAGES : " llvm-dev libclang-common-10-dev"
300
305
EXTRA_CMAKE_FLAGS : " -DBUILD_LTO_LIBS=ON"
301
306
PARALLELISM : 8
302
- PATH : ${CIRRUS_WORKING_DIR}/../ninja:${PATH}
307
+ PATH : ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ ninja:${PATH}
303
308
<< : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
304
309
<< : *COMMON_STEPS_TEMPLATE
305
310
@@ -357,6 +362,7 @@ task:
357
362
-DLLVM_ROOT_DIR=$CIRRUS_WORKING_DIR/../llvm
358
363
-DD_COMPILER=$CIRRUS_WORKING_DIR/../bootstrap-ldc/bin/ldmd2
359
364
PARALLELISM : 4
365
+ PATH : ${CIRRUS_WORKING_DIR}/../cmake/bin:${PATH}
360
366
CLANG_VERSION : ' 15.0.3' # 15.0.6 requires a more recent libstdc++.so.6 than shipped with Ubuntu 20
361
367
CC : $CIRRUS_WORKING_DIR/../clang/bin/clang
362
368
CXX : $CIRRUS_WORKING_DIR/../clang/bin/clang++
0 commit comments