| commit | a46751c7e614f57048069d67646b170bfdca0926 | [log] [tgz] |
|---|---|---|
| author | Jan Kundrát <jan.kundrat@cesnet.cz> | Mon Oct 19 21:50:33 2020 +0200 |
| committer | Václav Kubernát <kubernat@cesnet.cz> | Fri Oct 23 10:30:26 2020 +0200 |
| tree | fb8665e823ff63712120d59516dca6b0d59aa7a0 | |
| parent | d1beedcb6155c4a85ab2abc9b18040d57a54542c [diff] [blame] |
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/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