From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp36.i.mail.ru (smtp36.i.mail.ru [94.100.177.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 21AFD469719 for ; Tue, 6 Oct 2020 14:21:24 +0300 (MSK) Date: Tue, 6 Oct 2020 14:21:23 +0300 From: Kirill Yukhin Message-ID: <20201006112123.g52kaxkqlpkgp4bz@tarantool.org> References: <60bc8f4890c83dc5bd5a8bdf6d4e5eeab1551a64.1601977644.git.kyukhin@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <60bc8f4890c83dc5bd5a8bdf6d4e5eeab1551a64.1601977644.git.kyukhin@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 2/2] ci: add replace clang8 with clang11 List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: avtikhon@tarantool.org Cc: tarantool-patches@dev.tarantool.org 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