diff --git a/.travis.yml b/.travis.yml index 32429dca2..9f9deb0d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: before_install: - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" - sudo apt-get -q update - - sudo apt-get install -y libpcre3-dev git-lfs librocksdb-dev + - sudo apt-get install -y libpcre3-dev librocksdb-dev - os: osx env: - NPROC=2 diff --git a/scripts/setup_official_tests.sh b/scripts/setup_official_tests.sh index ffca140f4..98b953db8 100755 --- a/scripts/setup_official_tests.sh +++ b/scripts/setup_official_tests.sh @@ -9,7 +9,6 @@ set -e -TMP_CACHE_DIR="tmpcache" SUBREPO_DIR="tests/official/fixtures" # verbosity level [[ -z "$V" ]] && V=0 @@ -18,21 +17,6 @@ CACHE_DIR="$1" # optional parameter pointing to a CI cache dir. Without it, we j [[ -d "${SUBREPO_DIR}" ]] || { echo "This script should be run from the \"nim-beacon-chain\" repo top dir."; exit 1; } -# macOS quirks -if uname | grep -qi "darwin"; then - ON_MACOS=1 - STAT_FORMAT="-f %m" -else - ON_MACOS=0 - STAT_FORMAT="-c %Y" -fi - -# to and from stdout -DECOMPRESS_XZ="false" -COMPRESS_XZ="false" -which 7z &>/dev/null && { DECOMPRESS_XZ="7z e -txz -bd -so"; COMPRESS_XZ="7z a -txz -an -bd -si -so"; } -which xz &>/dev/null && { DECOMPRESS_XZ="xz -d -c -T 0"; COMPRESS_XZ="xz -c -T 0"; } - # script output echo -e "$BUILD_MSG" [[ "$V" == "0" ]] && exec 3>&1 4>&2 &>/dev/null # save stdout and stderr before sending them into oblivion