From d528ec8e47602f00f522f8373eafc00562aa9cf4 Mon Sep 17 00:00:00 2001 From: Aleksei Sidorov Date: Thu, 30 Jan 2020 22:22:16 +0300 Subject: [PATCH 1/2] Use rust 1.41 and builtin rockdb --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f8363e554..e669a5a8f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ addons: env: global: - - RUST_COMPILER_VERSION=1.36.0 + - RUST_COMPILER_VERSION=1.41.0 - ROCKSDB_LIB_DIR=/usr/lib # REPO_TOKEN used for integration with coveralls is encoded here - secure: Fp22iaJpttsIArAyWmdCGNtljIALTYRVKO7O+H2hgBkwHHqrU7+15sbaq3xzhz4YNWNfuFMIkFUBgd/KYHgAuNDDrtm2agib13C0lQT1NFQO9ccmNCJNsXQrYrXGwpnNqPKp0YmfBfgNwzEpBerlbtvzV/T/RZukT/403XxwxU9y5tHfQokwVLibqP2jJsxdihTfCKIOs+o6hBfArmsn+e+panEv17ZrCjOmBIM/W70Rf2rEM26wFnYsfnAUTCkpl4Ong0SYNpZZxNMtw61W8ApDY8bpz7cKUxCv7SmD3kO7Y+TTHWfWYx6FNXtUpE1vCi6I7fZAY16rViTWOX55NCeFQz56XER7ArJQZtC/nC1lZ9tGKtcofu2Rq7WUoRuTwvLTaf6VzAP/CUj0DUxkV+8WUggl3s/Im7Y9rn8Aqvh8LReZmqzTY+dJ0hFG4DLoLtl71eTEnNoumi5UleBhJPaei3wPNPHg1WlOmhFyhRCsbIIGiyFtSj/faLmdc7tN/sBFANb0g4Exl0mRNvB0IfS1gM6XouEGUTlVree68p11PnsGJGs/QaUB9F9AAGVKTZ2kz7sqkCDdGmLxzbdidYDHZtYWfOIYSJCQsA09n2Txi0fwNByKfl/spdyMmtI1uGeT803rhN9vu0NGrQFG3mU7mqO33fUDEStIQ6/xn0A= @@ -60,10 +60,6 @@ matrix: osx_image: xcode11.3 env: - CHECK_RUST=false - - ROCKSDB_LIB_DIR=/usr/local/lib - - ROCKSDB_STATIC=1 - - SNAPPY_LIB_DIR=/usr/local/lib - - SNAPPY_STATIC=1 cache: directories: From 1710a3f540fd3f828bb9fa734db0ae1645e4c8ab Mon Sep 17 00:00:00 2001 From: Aleksei Sidorov Date: Mon, 3 Feb 2020 17:10:13 +0300 Subject: [PATCH 2/2] An attempt to use prebuilt static ROCKSDB --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e669a5a8f9..656dced0ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,10 @@ matrix: osx_image: xcode11.3 env: - CHECK_RUST=false + - ROCKSDB_LIB_DIR=/usr/local/lib + - ROCKSDB_STATIC=1 + - SNAPPY_LIB_DIR=/usr/local/lib + - SNAPPY_STATIC=1 cache: directories: