From 05c968ae4b43eff6644cd978a63770e088cb2101 Mon Sep 17 00:00:00 2001
From: Kirill Yukhin <kyukhin@tarantool.org>
Date: Tue, 6 Oct 2020 09:12:11 +0300
Subject: [PATCH] ci: add replace clang8 with clang11
Update Clang 8 testing with most recent version of
Clang: 11. Clang 8 still in the image.
Closes #5386
---
.gitlab-ci.yml | 10 +++++-----
.gitlab.mk | 2 +-
.travis.mk | 17 ++++++++++++-----
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a75edb5e5..d40dc74e35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ before_script:
tags:
- docker_test
-.docker_test_clang8_template: &docker_test_clang8_definition
+.docker_test_clang11_template: &docker_test_clang8_definition
<<: *artifacts_files_definition
image: "${CI_REGISTRY}/${CI_PROJECT_PATH}/testing/debian-buster:latest"
stage: test
@@ -199,16 +199,16 @@ release_lto:
script:
- ${GITLAB_MAKE} test_debian_no_deps
-release_lto_clang8:
+release_lto_clang11:
<<: *docker_test_clang8_definition
variables:
- CC: clang-8
- CXX: clang++-8
+ CC: clang-11
+ CXX: clang++-11
CMAKE_EXTRA_PARAMS: -DENABLE_LTO=ON
script:
- ${GITLAB_MAKE} test_debian_no_deps
-release_asan_clang8:
+release_asan_clang11:
<<: *docker_test_clang8_definition
script:
- ${GITLAB_MAKE} test_asan_debian_no_deps
diff --git a/.gitlab.mk b/.gitlab.mk
index 0ab8966234..e1a83ac079 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_8
+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 6777abd4dd..d797472e2c 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -28,7 +28,7 @@ test: test_$(TRAVIS_OS_NAME)
test_linux: docker_test_debian
coverage: docker_coverage_debian
lto: docker_test_debian
-lto_clang8: docker_test_debian_clang8
+lto_clang11: docker_test_debian_clang11
asan: docker_test_asan_debian
docker_%:
@@ -55,7 +55,7 @@ docker_%:
# Depends
-# When dependencies in 'deps_debian' or 'deps_buster_clang_8' goal
+# When dependencies in 'deps_debian' or 'deps_buster_clang_11' goal
# are changed, push a new docker image into GitLab Registry using
# the following command:
#
@@ -83,6 +83,13 @@ deps_buster_clang_8: deps_debian
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
+ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+ apt-get update
+ apt-get install -y clang-11 llvm-11-dev
+
deps_debian_jepsen: $(BIN_DIR)/clojure $(BIN_DIR)/lein $(BIN_DIR)/terraform
apt-get update ${APT_EXTRA_FLAGS} && apt-get install -y -f \
openjdk-8-jre openjdk-8-jre-headless libjna-java gnuplot graphviz \
@@ -115,7 +122,7 @@ test_debian_no_deps: build_debian
test_debian: deps_debian test_debian_no_deps
-test_debian_clang8: deps_debian deps_buster_clang_8 test_debian_no_deps
+test_debian_clang11: deps_debian deps_buster_clang_11 test_debian_no_deps
# Debug with coverage
@@ -143,7 +150,7 @@ coverage_debian: deps_debian test_coverage_debian_no_deps
# ASAN
build_asan_debian:
- CC=clang-8 CXX=clang++-8 cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ CC=clang-11 CXX=clang++-11 cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DENABLE_WERROR=ON -DENABLE_ASAN=ON -DENABLE_UB_SANITIZER=ON \
${CMAKE_EXTRA_PARAMS}
make -j
@@ -159,7 +166,7 @@ test_asan_debian_no_deps: build_asan_debian
ASAN_OPTIONS=heap_profile=0:unmap_shadow_on_exit=1:detect_invalid_pointer_pairs=1:symbolize=1:detect_leaks=1:dump_instruction_bytes=1:print_suppressions=0 \
./test-run.py --force $(TEST_RUN_EXTRA_PARAMS)
-test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps
+test_asan_debian: deps_debian deps_buster_clang_11 test_asan_debian_no_deps
# Static build
--
GitLab