Switch to Fedora 32 builds
Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/dependencies/+/3128/
Depends-on: https://cesnet-gerrit-public/c/CzechLight/dependencies/+/3128/
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/dependencies/+/3128/
Change-Id: I3e5335ae82b04346aa6ac9bd50f5e3574b176f4e
diff --git a/.zuul.public.yaml b/.zuul.public.yaml
index 5045045..d03af02 100644
--- a/.zuul.public.yaml
+++ b/.zuul.public.yaml
@@ -1,15 +1,15 @@
- project:
check:
jobs:
- - f31-gcc-cover:
- requires: CzechLight-deps-f31-gcc
- - f31-clang-asan-ubsan:
- requires: CzechLight-deps-f31-clang-asan-ubsan
- - f31-clang-tsan:
- requires: CzechLight-deps-f31-clang-tsan
- - f31-cpp-coverage-diff:
+ - f32-gcc-cover:
+ requires: CzechLight-deps-f32-gcc
+ - f32-clang-asan-ubsan:
+ requires: CzechLight-deps-f32-clang-asan-ubsan
+ - f32-clang-tsan:
+ requires: CzechLight-deps-f32-clang-tsan
+ - f32-cpp-coverage-diff:
voting: false
- clang-format:
voting: false
- - f31-gcc-cover-previous:
- requires: CzechLight-deps-f31-gcc
+ - f32-gcc-cover-previous:
+ requires: CzechLight-deps-f32-gcc
diff --git a/ci/build.sh b/ci/build.sh
index ec21ede..c9d8d93 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -20,6 +20,8 @@
export CXX=clang++
export LD=clang
export CXXFLAGS="-stdlib=libc++"
+ # spdlog passes std::string instances, and it's built against GCC's libstdc++ on the CI
+ sed -i 's/spdlog::spdlog/spdlog::spdlog_header_only/' ${ZUUL_PROJECT_SRC_DIR}/CMakeLists.txt
fi
if [[ $ZUUL_JOB_NAME =~ .*-ubsan ]]; then
@@ -32,11 +34,6 @@
export CFLAGS="-fsanitize=address ${CFLAGS}"
export CXXFLAGS="-fsanitize=address ${CXXFLAGS}"
export LDFLAGS="-fsanitize=address ${LDFLAGS}"
-
- if [[ $ZUUL_JOB_NAME =~ f31-.* ]]; then
- # On Fedora 31, libev's ev_realloc looks fishy for sysrepoctl & sysrepocfg
- export LSAN_OPTIONS="suppressions=${ZUUL_PROJECT_SRC_DIR}/ci/lsan.supp:print_suppressions=0"
- fi
fi
if [[ $ZUUL_JOB_NAME =~ .*-tsan ]]; then
diff --git a/ci/lsan.supp b/ci/lsan.supp
deleted file mode 100644
index af49784..0000000
--- a/ci/lsan.supp
+++ /dev/null
@@ -1,11 +0,0 @@
-# Fedora 31: sysrepocfg and sysrepoctl binaries
-# Direct leak of 112 byte(s) in 2 object(s) allocated from:
-# #0 0x7f12a9dc314e in realloc (/lib64/libasan.so.5+0x10e14e)
-# #1 0x7f12a760bb99 in ev_realloc /usr/src/debug/libev-4.27-1.fc31.x86_64/ev.c:1776
-leak:ev.c
-
-# I have no idea if it is legit -- libnetconf2's test_server_thread
-# Direct leak of 321 byte(s) in 1 object(s) allocated from:
-# #0 0x7fc37cd79f16 in __interceptor_calloc (/lib64/libasan.so.5+0x10df16)
-# #1 0x7fc37b004871 in ssh_find_all_matching /usr/src/debug/libssh-0.9.4-2.fc31.x86_64/src/token.c:221
-leak:ssh_find_all_matching
diff --git a/submodules/dependencies b/submodules/dependencies
index ae4bb88..db9a4fe 160000
--- a/submodules/dependencies
+++ b/submodules/dependencies
@@ -1 +1 @@
-Subproject commit ae4bb88e55ec9ebe2545ba9c49360778fa7a374b
+Subproject commit db9a4fe2b46f22a8881403f4d1d0677e687f9451