From 048b71a1cdc0200f3bad7bbde7a2e8785079e729 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 30 Oct 2020 21:05:57 +0100 Subject: [PATCH 1/1] travis: install libtbb-dev --- .cirrus.yml | 3 ++- .github/workflows/cmake-build-ci.gen | 1 + .github/workflows/cmake-build-ci.yml | 4 ++++ .travis.yml | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index adc3b3c2..8f1aae37 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -35,7 +35,8 @@ task: libevent \ pkgconf \ subversion \ - sudo + sudo \ + tbb memcached_script: | svn co https://svn.freebsd.org/ports/tags/${ports}/databases/memcached memcached svn co https://svn.freebsd.org/ports/tags/${ports}/Mk /usr/ports/Mk diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index a26c8564..7ead2ddc 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -123,6 +123,7 @@ function steps_getdeps() { sudo apt-get install \ libevent-dev \ libsasl2-dev \ + libtbb-dev \ ${INSTALL_MEMCACHED} \ ${INSTALL_CC} ${INSTALL_CXX} sudo systemctl stop memcached || true diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml index 4c5681a7..aa349ca2 100644 --- a/.github/workflows/cmake-build-ci.yml +++ b/.github/workflows/cmake-build-ci.yml @@ -58,6 +58,7 @@ jobs: sudo apt-get install \ libevent-dev \ libsasl2-dev \ + libtbb-dev \ ${INSTALL_MEMCACHED} \ ${INSTALL_CC} ${INSTALL_CXX} sudo systemctl stop memcached || true @@ -134,6 +135,7 @@ jobs: sudo apt-get install \ libevent-dev \ libsasl2-dev \ + libtbb-dev \ ${INSTALL_MEMCACHED} \ ${INSTALL_CC} ${INSTALL_CXX} sudo systemctl stop memcached || true @@ -210,6 +212,7 @@ jobs: sudo apt-get install \ libevent-dev \ libsasl2-dev \ + libtbb-dev \ ${INSTALL_MEMCACHED} \ ${INSTALL_CC} ${INSTALL_CXX} sudo systemctl stop memcached || true @@ -354,6 +357,7 @@ jobs: sudo apt-get install \ libevent-dev \ libsasl2-dev \ + libtbb-dev \ ${INSTALL_MEMCACHED} \ ${INSTALL_CC} ${INSTALL_CXX} sudo systemctl stop memcached || true diff --git a/.travis.yml b/.travis.yml index adbbedf3..f7cc6b1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ addons: packages: - libevent-dev - libsasl2-dev + - libtbb-dev env: - CMAKE_BUILD_TYPE=Debug BUILD_TESTING=true ENABLE_SASL=true ENABLE_HASH_HSIEH=true CFLAGS="-O0 --coverage" CXXFLAGS="-O0 --coverage" -- 2.30.2