Skip to content

Commit baddabe

Browse files
committed
Cirrus & Circle CI: Use latest CMake v3.27.1
1 parent 112eb16 commit baddabe

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

.circleci/config.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,24 @@ commonSteps: &commonSteps
1818
fi
1919
apt-get -q update
2020
apt-get -yq install \
21-
git-core cmake $gcc_pkg \
21+
git-core $gcc_pkg \
2222
zlib1g-dev $libcurl_pkg curl gdb python3 python3-pip tzdata unzip zip \
2323
$EXTRA_APT_PACKAGES
24+
# Download & extract CMake
25+
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-x86_64.tar.gz
26+
mkdir cmake
27+
tar -xf cmake.tar.gz --strip 1 -C cmake
28+
rm cmake.tar.gz
2429
# Download & extract Ninja
2530
curl -fL --retry 3 --max-time 60 -O https://github.com/symmetryinvestments/ninja/releases/download/v1.11.1-sym1/ninja-linux.zip
2631
mkdir ninja
2732
unzip ninja-linux.zip -d ninja
2833
rm ninja-linux.zip
29-
# Add Ninja to PATH for future steps
30-
echo "export PATH=$PWD/ninja:$PATH" >> $BASH_ENV
34+
# Add CMake and Ninja to PATH for future steps
35+
echo "export PATH=$PWD/cmake/bin:$PWD/ninja:$PATH" >> $BASH_ENV
3136
else
3237
# Download & extract CMake
33-
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
38+
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
3439
mkdir cmake
3540
tar -xf cmake.tar.gz --strip 3 -C cmake
3641
rm cmake.tar.gz

.cirrus.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,15 @@ install_ubuntu_prerequisites_template: &INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
190190
fi
191191
apt-get -q update
192192
apt-get -yq install \
193-
git-core cmake ninja-build $gcc_pkg \
193+
git-core ninja-build $gcc_pkg \
194194
zlib1g-dev $libcurl_pkg curl gdb python3 python3-pip tzdata unzip zip \
195195
$EXTRA_APT_PACKAGES
196196
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
197202
# Download & extract custom Ninja on x86_64
198203
if [[ "$CI_ARCH" == "x86_64" ]]; then
199204
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
214219
cd $CIRRUS_WORKING_DIR/..
215220
sysctl -n hw.logicalcpu
216221
# 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
218223
mkdir cmake
219224
tar -xf cmake.tar.gz --strip 3 -C cmake
220225
rm cmake.tar.gz
@@ -260,7 +265,7 @@ task:
260265
EXTRA_APT_PACKAGES: "llvm-dev libclang-common-10-dev"
261266
EXTRA_CMAKE_FLAGS: "-DMULTILIB=ON -DRT_SUPPORT_SANITIZERS=ON -DBUILD_LTO_LIBS=ON"
262267
PARALLELISM: 8
263-
PATH: ${CIRRUS_WORKING_DIR}/../ninja:${PATH}
268+
PATH: ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ninja:${PATH}
264269
<< : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
265270
<< : *COMMON_STEPS_TEMPLATE
266271

@@ -279,7 +284,7 @@ task:
279284
EXTRA_APT_PACKAGES: "gdmd llvm-dev libclang-common-15-dev"
280285
EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON -DD_COMPILER=gdmd -DLDC_LINK_MANUALLY=ON"
281286
PARALLELISM: 8
282-
PATH: ${CIRRUS_WORKING_DIR}/../ninja:${PATH}
287+
PATH: ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ninja:${PATH}
283288
# for gdmd:
284289
LANG: C.UTF-8
285290
<< : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
@@ -299,7 +304,7 @@ task:
299304
EXTRA_APT_PACKAGES: "llvm-dev libclang-common-10-dev"
300305
EXTRA_CMAKE_FLAGS: "-DBUILD_LTO_LIBS=ON"
301306
PARALLELISM: 8
302-
PATH: ${CIRRUS_WORKING_DIR}/../ninja:${PATH}
307+
PATH: ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ninja:${PATH}
303308
<< : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
304309
<< : *COMMON_STEPS_TEMPLATE
305310

@@ -357,6 +362,7 @@ task:
357362
-DLLVM_ROOT_DIR=$CIRRUS_WORKING_DIR/../llvm
358363
-DD_COMPILER=$CIRRUS_WORKING_DIR/../bootstrap-ldc/bin/ldmd2
359364
PARALLELISM: 4
365+
PATH: ${CIRRUS_WORKING_DIR}/../cmake/bin:${PATH}
360366
CLANG_VERSION: '15.0.3' # 15.0.6 requires a more recent libstdc++.so.6 than shipped with Ubuntu 20
361367
CC: $CIRRUS_WORKING_DIR/../clang/bin/clang
362368
CXX: $CIRRUS_WORKING_DIR/../clang/bin/clang++

0 commit comments

Comments
 (0)