diff --git a/.travis.yml b/.travis.yml index 2acff576e..0ba1dbe8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,20 +2,18 @@ dist: xenial language: cpp os: - linux - - osx arch: - - amd64 - arm64 - ppc64le compiler: - clang - gcc -osx_image: xcode9.4 cache: - ccache addons: apt: + update: true sources: - ubuntu-toolchain-r-test packages: @@ -26,15 +24,6 @@ addons: - liblzma-dev # xv - libzstd-dev - zlib1g-dev - homebrew: - update: true - packages: - - ccache - - gflags - - lz4 - - snappy - - xz - - zstd env: - TEST_GROUP=platform_dependent # 16-18 minutes @@ -58,20 +47,6 @@ env: matrix: exclude: - - os: osx - env: JOB_NAME=cmake-gcc8 - - os: osx - env: JOB_NAME=cmake-gcc9 - - os: osx - env: JOB_NAME=cmake-gcc9-c++20 - - os: osx - env: JOB_NAME=cmake-mingw - - os: osx - env: JOB_NAME=make-gcc4.8 - - os: osx - arch: ppc64le - - os: osx - compiler: gcc - os : linux arch: arm64 env: JOB_NAME=cmake-mingw @@ -86,28 +61,6 @@ matrix: env: JOB_NAME=make-gcc4.8 - os: linux compiler: clang - # With migration to CircleCI, exclude Linux/amd64 for pull requests - # (but build in branches for now) - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : linux - arch: amd64 - # Exclude most osx, arm64 and ppc64le tests for pull requests, but build in branches - # Temporarily disable ppc64le cmake test while snapd is broken - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: linux - arch: ppc64le - env: JOB_NAME=cmake - # Exclude all osx since it should be covered by CircleCI - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: osx - env: TEST_GROUP=platform_dependent - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: osx - env: JOB_NAME=cmake - # NB: the cmake build is a partial java test - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: osx - env: TEST_GROUP=1 - if: type = pull_request AND commit_message !~ /FULL_CI/ os : linux arch: arm64 @@ -116,9 +69,6 @@ matrix: os: linux arch: ppc64le env: TEST_GROUP=1 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: osx - env: TEST_GROUP=2 - if: type = pull_request AND commit_message !~ /FULL_CI/ os : linux arch: arm64 @@ -127,9 +77,6 @@ matrix: os: linux arch: ppc64le env: TEST_GROUP=2 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: osx - env: TEST_GROUP=3 - if: type = pull_request AND commit_message !~ /FULL_CI/ os : linux arch: arm64 @@ -138,9 +85,6 @@ matrix: os: linux arch: ppc64le env: TEST_GROUP=3 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os: osx - env: TEST_GROUP=4 - if: type = pull_request AND commit_message !~ /FULL_CI/ os : linux arch: arm64 @@ -149,9 +93,6 @@ matrix: os: linux arch: ppc64le env: TEST_GROUP=4 - - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/ - os : osx - env: JOB_NAME=java_test - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/ os : linux arch: arm64 @@ -160,9 +101,6 @@ matrix: os: linux arch: ppc64le env: JOB_NAME=java_test - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : osx - env: JOB_NAME=lite_build - if: type = pull_request AND commit_message !~ /FULL_CI/ os : linux arch: arm64 @@ -171,9 +109,6 @@ matrix: os: linux arch: ppc64le env: JOB_NAME=lite_build - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : osx - env: JOB_NAME=examples - if: type = pull_request AND commit_message !~ /FULL_CI/ os : linux arch: arm64 @@ -206,9 +141,6 @@ matrix: os: linux arch: ppc64le env: JOB_NAME=cmake-gcc9-c++20 - - if: type = pull_request AND commit_message !~ /FULL_CI/ - os : osx - env: JOB_NAME=status_checked - if: type = pull_request AND commit_message !~ /FULL_CI/ os : linux arch: arm64 @@ -219,9 +151,6 @@ matrix: env: JOB_NAME=status_checked install: - - if [ "${TRAVIS_OS_NAME}" == osx ]; then - PATH=$PATH:/usr/local/opt/ccache/libexec; - fi - if [ "${JOB_NAME}" == cmake-gcc8 ]; then sudo apt-get install -y g++-8 || exit $?; CC=gcc-8 && CXX=g++-8; @@ -237,22 +166,21 @@ install: sudo apt-get install -y g++-4.8 || exit $?; CC=gcc-4.8 && CXX=g++-4.8; fi - - if [[ "${JOB_NAME}" == cmake* ]] && [ "${TRAVIS_OS_NAME}" == linux ]; then - sudo apt-get install snapd && sudo snap install cmake --beta --classic || exit $?; - export PATH=/snap/bin:$PATH; + - | + if [[ "${JOB_NAME}" == cmake* ]]; then + sudo apt-get remove -y cmake cmake-data + export CMAKE_DEB="cmake-3.14.5-Linux-$(uname -m).deb" + export CMAKE_DEB_URL="https://rocksdb-deps.s3-us-west-2.amazonaws.com/cmake/${CMAKE_DEB}" + curl --silent --fail --show-error --location --output "${CMAKE_DEB}" "${CMAKE_DEB_URL}" || exit $? + sudo dpkg -i "${CMAKE_DEB}" || exit $? + which cmake && cmake --version fi - | if [[ "${JOB_NAME}" == java_test || "${JOB_NAME}" == cmake* ]]; then # Ensure JDK 8 - if [ "${TRAVIS_OS_NAME}" == osx ]; then - brew tap AdoptOpenJDK/openjdk || exit $? - brew cask install adoptopenjdk8 || exit $? - export JAVA_HOME=$(/usr/libexec/java_home) - else - sudo apt-get install -y openjdk-8-jdk || exit $? - export PATH=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin:$PATH - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture) - fi + sudo apt-get install -y openjdk-8-jdk || exit $? + export PATH=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin:$PATH + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture) echo "JAVA_HOME=${JAVA_HOME}" which java && java -version which javac && javac -version