From a70ed671a766639e0e56cf07afea7a63377221b3 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Sat, 14 Dec 2019 13:46:20 +0800 Subject: [PATCH] update centos7 case on github actions --- ci/docker/centos-7-core.dockerfile | 5 ++--- docker-compose.yml | 2 +- docker/build_env/cpu/centos7/Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ci/docker/centos-7-core.dockerfile b/ci/docker/centos-7-core.dockerfile index ee895405..5bb7ca38 100644 --- a/ci/docker/centos-7-core.dockerfile +++ b/ci/docker/centos-7-core.dockerfile @@ -8,12 +8,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN yum install -y epel-release centos-release-scl-rh && yum install -y wget curl which && \ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ yum install -y ccache make automake git python3-pip libcurl-devel python3-devel boost-static mysql-devel \ - devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-gcc-gfortran llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra mysql lcov \ + devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra mysql lcov \ && \ rm -rf /var/cache/yum/* -RUN echo "source scl_source enable devtoolset-6" >> /etc/profile.d/devtoolset-6.sh +RUN echo "source scl_source enable devtoolset-7" >> /etc/profile.d/devtoolset-7.sh RUN echo "source scl_source enable llvm-toolset-7.0" >> /etc/profile.d/llvm-toolset-7.sh -RUN source scl_source enable devtoolset-6 && source scl_source enable llvm-toolset-7.0 ENV CLANG_TOOLS_PATH="/opt/rh/llvm-toolset-7.0/root/usr/bin" diff --git a/docker-compose.yml b/docker-compose.yml index 01adaf72..4ee8d7aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ x-ccache: &ccache x-command: &cpp-command > /bin/bash -c " - /milvus/ci/scripts/build.sh -o ${MILVUS_INSTALL_PREFIX} -l -u -c + /milvus/ci/scripts/build.sh -t Release -o ${MILVUS_INSTALL_PREFIX} -l -u -c /milvus/ci/scripts/coverage.sh -o ${MILVUS_INSTALL_PREFIX} -u root -p 123456 -t mysql" services: diff --git a/docker/build_env/cpu/centos7/Dockerfile b/docker/build_env/cpu/centos7/Dockerfile index 1451652d..6b3817f8 100644 --- a/docker/build_env/cpu/centos7/Dockerfile +++ b/docker/build_env/cpu/centos7/Dockerfile @@ -3,11 +3,11 @@ FROM centos:centos7 RUN yum install -y epel-release centos-release-scl-rh && yum install -y wget curl which && \ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ yum install -y ccache make automake git python3-pip libcurl-devel python3-devel boost-static mysql-devel \ - devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-gcc-gfortran llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra mysql lcov \ + devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra mysql lcov \ && \ rm -rf /var/cache/yum/* -RUN echo "source scl_source enable devtoolset-6" >> /etc/profile.d/devtoolset-6.sh +RUN echo "source scl_source enable devtoolset-7" >> /etc/profile.d/devtoolset-7.sh RUN echo "source scl_source enable llvm-toolset-7.0" >> /etc/profile.d/llvm-toolset-7.sh ENV CLANG_TOOLS_PATH="/opt/rh/llvm-toolset-7.0/root/usr/bin" -- GitLab