From 77d672189d3b9c55399c7bf5ac921d89e69044c8 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Thu, 9 Jan 2020 10:10:41 -0500 Subject: [PATCH] Remove ccache. Used only on Travis during repeat builds. --- .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile | 2 -- .cicd/platforms/pinned/centos-7.7-pinned.dockerfile | 5 ----- .cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile | 9 --------- .cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile | 2 +- .../unpinned/amazon_linux-2-unpinned.dockerfile | 2 -- .cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile | 5 ----- .../platforms/unpinned/ubuntu-18.04-unpinned.dockerfile | 2 +- 7 files changed, 2 insertions(+), 25 deletions(-) diff --git a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile index 8116d8b7296..f82c9ccf3fb 100644 --- a/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile +++ b/.cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile @@ -79,8 +79,6 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o rm -rf mongo-cxx-driver-r3.4.0.tar.gz /mongo-cxx-driver-r3.4.0 # add mongodb to path ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin -# install ccache -RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum install -y ccache # install nvm RUN touch ~/.bashrc RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash diff --git a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile index e84b455a7a1..3d2e8e6c433 100644 --- a/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile +++ b/.cicd/platforms/pinned/centos-7.7-pinned.dockerfile @@ -88,11 +88,6 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o rm -rf mongo-cxx-driver-r3.4.0.tar.gz /mongo-cxx-driver-r3.4.0 # add mongodb to path ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin -# install ccache -RUN yum install -y ccache -# fix ccache for centos -RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++ -ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin" # install nvm RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash # load nvm in non-interactive shells diff --git a/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile b/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile index f788ede65f4..4b0e9a6f151 100644 --- a/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile +++ b/.cicd/platforms/pinned/ubuntu-16.04-pinned.dockerfile @@ -80,15 +80,6 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o rm -rf mongo-cxx-driver-r3.4.0.tar.gz /mongo-cxx-driver-r3.4.0 # add mongodb to path ENV PATH=${PATH}:/mongodb-linux-x86_64-ubuntu1604-3.6.3/bin -# install ccache -RUN curl -LO https://github.com/ccache/ccache/releases/download/v3.4.1/ccache-3.4.1.tar.gz && \ - tar -xzf ccache-3.4.1.tar.gz && \ - cd ccache-3.4.1 && \ - ./configure && \ - make && \ - make install && \ - cd / && \ - rm -rf ccache-3.4.1.tar.gz /ccache-3.4.1 # install nvm RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash # load nvm in non-interactive shells diff --git a/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile b/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile index a8a5db238c2..808702f6143 100644 --- a/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile +++ b/.cicd/platforms/pinned/ubuntu-18.04-pinned.dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && \ bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \ autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \ autoconf libtool g++ gcc curl zlib1g-dev sudo ruby libusb-1.0-0-dev \ - libcurl4-gnutls-dev pkg-config patch ccache vim-common jq + libcurl4-gnutls-dev pkg-config patch vim-common jq # build cmake. RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \ tar -xzf cmake-3.13.2.tar.gz && \ diff --git a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile index 0fd3e856578..9e21195c86a 100644 --- a/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile +++ b/.cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile @@ -52,8 +52,6 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o rm -rf mongo-cxx-driver-r3.4.0.tar.gz /mongo-cxx-driver-r3.4.0 # add mongodb to path ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin -# install ccache -RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum install -y ccache # install nvm RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash # load nvm in non-interactive shells diff --git a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile index e4f2b686e34..257dca4ea7b 100644 --- a/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile +++ b/.cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile @@ -63,11 +63,6 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o rm -rf mongo-cxx-driver-r3.4.0.tar.gz /mongo-cxx-driver-r3.4.0 # add mongodb to path ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin -# install ccache -RUN yum install -y ccache -# fix ccache for centos -RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++ -ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin" # install nvm RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash # load nvm in non-interactive shells diff --git a/.cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile index ddf49530740..233117b6a4e 100644 --- a/.cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile +++ b/.cicd/platforms/unpinned/ubuntu-18.04-unpinned.dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && \ bzip2 automake libbz2-dev libssl-dev doxygen graphviz libgmp3-dev \ autotools-dev libicu-dev python2.7 python2.7-dev python3 python3-dev \ autoconf libtool curl zlib1g-dev sudo ruby libusb-1.0-0-dev \ - libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang-7 ccache vim-common jq + libcurl4-gnutls-dev pkg-config patch llvm-7-dev clang-7 vim-common jq # build cmake. RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \ tar -xzf cmake-3.13.2.tar.gz && \