From 019a5052d97c5c4ab37dfa30ca668f58268174bd Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Tue, 21 Jun 2022 07:44:45 +0800 Subject: [PATCH] CI: disable unstable MesaLink --- .travis.yml | 1 - build_in_travis_ci.sh | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3288f12cc9..9200d9603c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,6 @@ install: - sudo apt-get install -qq realpath libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev libboost-dev libssl-dev libevent-dev libboost-test-dev libgoogle-glog-dev - sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo env "PATH=$PATH" cmake . && sudo make && sudo mv libgtest* /usr/lib/ && cd - - sudo apt-get install -y gdb # install gdb -- wget https://mesalink.s3-us-west-1.amazonaws.com/MesaLink-1.0.0-x86_64_trusty.deb && sudo dpkg -i MesaLink-1.0.0-x86_64_trusty.deb # install MesaLink for trusty script: - sh build_in_travis_ci.sh diff --git a/build_in_travis_ci.sh b/build_in_travis_ci.sh index d0ff7abfd9..e273f769a9 100644 --- a/build_in_travis_ci.sh +++ b/build_in_travis_ci.sh @@ -56,11 +56,11 @@ elif [ "$PURPOSE" = "compile-with-cmake" ]; then elif [ "$PURPOSE" = "compile-with-bazel" ]; then bazel build -j 12 -c opt --copt -DHAVE_ZLIB=1 //... elif [ "$PURPOSE" = "compile-with-make-all-options" ]; then - init_make_config "--with-thrift --with-glog --with-mesalink" && make -j4 + init_make_config "--with-thrift --with-glog" && make -j4 elif [ "$PURPOSE" = "compile-with-cmake-all-options" ]; then - rm -rf bld && mkdir bld && cd bld && cmake -DWITH_MESALINK=ON -DWITH_GLOG=ON -DWITH_THRIFT=ON .. && make -j4 + rm -rf bld && mkdir bld && cd bld && cmake -DWITH_MESALINK=OFF -DWITH_GLOG=ON -DWITH_THRIFT=ON .. && make -j4 elif [ "$PURPOSE" = "compile-with-bazel-all-options" ]; then - bazel build -j 12 -c opt --define with_mesalink=true --define with_glog=true --define with_thrift=true --copt -DHAVE_ZLIB=1 //... + bazel build -j 12 -c opt --define with_mesalink=false --define with_glog=true --define with_thrift=true --copt -DHAVE_ZLIB=1 //... else echo "Unknown purpose=\"$PURPOSE\"" fi