[Tarantool-patches] [PATCH 2/2] ci: add replace clang8 with clang11
Kirill Yukhin
kyukhin at tarantool.org
Tue Oct 6 14:21:23 MSK 2020
Hello,
On 06 окт 12:59, Kirill Yukhin wrote:
> Update Clang 8 testing with most recent version of
> Clang: 11.
>
> Closes #5386
It was decided to keep clang8 as well. Iterative patch
in the bottom. Docker pre-built image updated. Branch
force-pushed.
--
Regards, Kirill Yukhin
diff --git a/.gitlab.mk b/.gitlab.mk
index 6e260dc..e1a83ac 100644
--- a/.gitlab.mk
+++ b/.gitlab.mk
@@ -40,7 +40,7 @@ export DEBIAN_STRETCH_DOCKERFILE
define DEBIAN_BUSTER_DOCKERFILE
FROM packpack/packpack:debian-buster
COPY .travis.mk .
-RUN make APT_EXTRA_FLAGS="--allow-releaseinfo-change-version --allow-releaseinfo-change-suite" -f .travis.mk deps_buster_clang_11
+RUN make APT_EXTRA_FLAGS="--allow-releaseinfo-change-version --allow-releaseinfo-change-suite" -f .travis.mk deps_buster_clang_8 deps_buster_clang_11
endef
export DEBIAN_BUSTER_DOCKERFILE
diff --git a/.travis.mk b/.travis.mk
index 88ddbe4..d797472 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -76,6 +76,13 @@ deps_debian:
python-msgpack python-yaml python-argparse python-six python-gevent \
lcov ruby clang llvm llvm-dev zlib1g-dev autoconf automake libtool
+deps_buster_clang_8: deps_debian
+ echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-8 main" > /etc/apt/sources.list.d/clang_8.list
+ echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-8 main" >> /etc/apt/sources.list.d/clang_8.list
+ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+ apt-get update
+ apt-get install -y clang-8 llvm-8-dev
+
deps_buster_clang_11: deps_debian
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-11 main" > /etc/apt/sources.list.d/clang_11.list
echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-11 main" >> /etc/apt/sources.list.d/clang_11.list
More information about the Tarantool-patches
mailing list