From ea9081bb3cb9424efc379b6a2108e0c1bfb7320b Mon Sep 17 00:00:00 2001 From: Manticore Team <42860502+githubmanticore@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:37:07 +0700 Subject: [PATCH] Update executor version and install galera in test-kit (#1695) --------- Co-authored-by: sanikolaev Co-authored-by: Sergey Nikolaev --- deps.txt | 2 +- dist/test_kit_docker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.txt b/deps.txt index cb6764710f..dcc7a0cef5 100644 --- a/deps.txt +++ b/deps.txt @@ -1,7 +1,7 @@ backup 1.3.3 23121805 ad2e5da buddy 2.0.9 23122008 55f95ab mcl 2.2.5 231204 1d1e432 -executor 1.0.11 23111308 574ff64 +executor 1.0.13 23122917 fa7313e executor-win 0.3.5 221125 a40554c --- ! Do not change the separator that splits this desc from the data diff --git a/dist/test_kit_docker.sh b/dist/test_kit_docker.sh index d147ff967b..132e49519e 100644 --- a/dist/test_kit_docker.sh +++ b/dist/test_kit_docker.sh @@ -109,7 +109,7 @@ docker exec manticore-test-kit bash -c \ 'ls -la /build/' # Install deps and add manticore-executor-dev to the container docker exec manticore-test-kit bash -c \ - "apt-get -y remove 'manticore-repo' && rm /etc/apt/sources.list.d/manticoresearch.list && apt-get update -y && apt-get install -y --allow-downgrades /build/*.deb libxml2 libcurl4 libonig5 libzip4 curl neovim git apache2-utils iproute2 bash && apt-get clean -y" + "apt-get -y update && apt-get -y install manticore-galera && apt-get -y remove 'manticore-repo' && rm /etc/apt/sources.list.d/manticoresearch.list && apt-get update -y && apt-get install -y --allow-downgrades /build/*.deb libxml2 libcurl4 libonig5 libzip4 curl neovim git apache2-utils iproute2 bash && apt-get clean -y" docker exec manticore-test-kit bash -c \ "php -r \"copy('https://getcomposer.org/installer', 'composer-setup.php');\" && php -r \"if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;\" && php composer-setup.php && php -r \"unlink('composer-setup.php');\" && mv composer.phar /usr/bin/composer || true"