andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use official CMake snap on Travis Linux (#6892)

Browse Source 
Summary:
Switch to using the official CMake snap rather than our own from S3.
See https://gitlab.kitware.com/cmake/cmake/-/issues/20122#note_769266
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6892

Reviewed By: ajkr

Differential Revision: D22211822

Pulled By: pdillinger

fbshipit-source-id: baf20005a4064d7f86b46087a41af4dfdea5510f
This commit is contained in:
Adam Retter 2020-06-25 13:48:15 -07:00 committed by Facebook GitHub Bot
parent d64cf0e4ee
commit 82d98447e4
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -239,13 +239,8 @@ install:
CC=gcc-4.8 && CXX=g++-4.8; CC=gcc-4.8 && CXX=g++-4.8;
fi fi
- if [[ "${JOB_NAME}" == cmake* ]] && [ "${TRAVIS_OS_NAME}" == linux ]; then - if [[ "${JOB_NAME}" == cmake* ]] && [ "${TRAVIS_OS_NAME}" == linux ]; then
CMAKE_DIST_URL="https://rocksdb-deps.s3-us-west-2.amazonaws.com/cmake/cmake-3.14.5-Linux-$(uname -m).tar.bz2"; sudo snap install cmake --beta --classic;
TAR_OPT="--strip-components=1 -xj"; export PATH=/snap/bin:$PATH;
if [ "aarch64" == "$(uname -m)" ]; then
sudo apt-get install -y libuv1 librhash0;
sudo apt-get upgrade -y libstdc++6;
fi;
mkdir cmake-dist && curl --silent --fail --show-error --location "${CMAKE_DIST_URL}" | tar -C cmake-dist ${TAR_OPT} && export PATH=$PWD/cmake-dist/bin:$PATH;
fi fi
- | - |
if [[ "${JOB_NAME}" == java_test || "${JOB_NAME}" == cmake* ]]; then if [[ "${JOB_NAME}" == java_test || "${JOB_NAME}" == cmake* ]]; then