Skip to content

Commit 71c8e7b

Browse files
committed
Use own prebuilt CMake
1 parent 5f48b79 commit 71c8e7b

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

travis/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-x", "-c"]
44

55
RUN yum install -y centos-release-scl-rh && \
66
yum install -y devtoolset-7 wget curl patchelf vim-common fuse libfuse2 libtool autoconf automake zlib-devel libjpeg-devel libpng-devel nano git && \
7-
wget https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.tar.gz -O- | tar xz --strip-components=1 -C/usr/local
7+
wget https://artifacts.assassinate-you.net/artifactory/cmake-centos6/cmake-v3.15.3-x86_64.tar.gz -O- | tar xz --strip-components=1 -C/usr/local
88

99
ENV ARCH=x86_64
1010
COPY entrypoint.sh /

travis/Dockerfile.i386

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,4 @@ ENV ARCH=i386
1919
ENTRYPOINT ["/entrypoint.sh"]
2020
SHELL ["/entrypoint.sh", "bash", "-x", "-c"]
2121

22-
# old git doesn't support cloning tags with -b, therefore cloning remote HEAD and then manually checking out the requested tag
23-
RUN git clone https://github.com/Kitware/CMake && \
24-
cd CMake && \
25-
git checkout v3.14.3 && \
26-
./configure --prefix=/usr/local --parallel=$(nproc) && \
27-
make -j$(nproc) all && \
28-
make install && \
29-
cd .. && \
30-
rm -r CMake/
22+
RUN wget https://artifacts.assassinate-you.net/artifactory/cmake-centos6/cmake-v3.15.3-i386.tar.gz -O- | tar xz --strip-components=1 -C/usr/local

0 commit comments

Comments
 (0)