Skip to content

Commit 42936bc

Browse files
committed
CI: user newer OS versions in CI workflow
also bump default development container to Ubuntu 24.04
1 parent ebdddad commit 42936bc

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

.github/workflows/run_checks.yml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022 Rainer Gerhards and Others
1+
# Copyright 2024 Rainer Gerhards and Others
22
#
33
# https://github.com/rsyslog/rsyslog-pkg-ubuntu
44
#
@@ -38,6 +38,7 @@ jobs:
3838
config: [centos_7, centos_8, debian_10, debian_11,
3939
fedora_35, fedora_36,
4040
ubuntu_18, ubuntu_20, ubuntu_22,
41+
ubuntu_24_san, ubuntu_24_tsan,
4142
ubuntu_22_san, ubuntu_22_tsan, ubuntu_22_distcheck, ubuntu_22_codecov,
4243
kafka_codecov, elasticsearch]
4344

@@ -155,6 +156,38 @@ jobs:
155156
--disable-omkafka --enable-debug --disable-elasticsearch \
156157
--disable-elasticsearch-tests"
157158
;;
159+
'ubuntu_24_san')
160+
export CI_SANITIZE_BLACKLIST='tests/asan.supp'
161+
export RSYSLOG_DEV_CONTAINER='rsyslog/rsyslog_dev_base_ubuntu:24.04'
162+
export CC='clang'
163+
export RSYSLOG_CONFIGURE_OPTIONS_EXTRA="--disable-elasticsearch-tests \
164+
--disable-libfaketime --without-valgrind-testbench --disable-valgrind \
165+
--disable-kafka-tests --enable-imdtls --enable-omdtls --disable-ommongodb"
166+
export CFLAGS="-std=c11 -fstack-protector -D_FORTIFY_SOURCE=2 \
167+
-fsanitize=address,undefined,nullability,unsigned-integer-overflow \
168+
-fno-sanitize-recover=undefined,nullability,unsigned-integer-overflow \
169+
-g -O3 -fno-omit-frame-pointer -fno-color-diagnostics"
170+
export LSAN_OPTIONS='detect_leaks=0'
171+
export UBSAN_OPTIONS='print_stacktrace=1'
172+
;;
173+
'ubuntu_24_tsan')
174+
export RSYSLOG_DEV_CONTAINER='rsyslog/rsyslog_dev_base_ubuntu:24.04'
175+
export CI_VALGRIND_SUPPRESSIONS="ubuntu22.04.supp"
176+
export CI_SANITIZE_BLACKLIST='tests/tsan.supp'
177+
export CC='clang'
178+
# impstats has known and OK races
179+
# mmpstrucdata TEMPORARILY disabled because of a threading hang on shutdown
180+
export RSYSLOG_CONFIGURE_OPTIONS_EXTRA="--disable-elasticsearch-tests --enable-imfile-tests \
181+
--disable-impstats --disable-kafka-tests --disable-mmpstrucdata \
182+
--disable-clickhouse --disable-clickhouse-tests --disable-kafka-tests \
183+
--disable-libfaketime --without-valgrind-testbench --disable-valgrind \
184+
--disable-ommongodb"
185+
export CFLAGS="-std=c11 -g -fstack-protector -D_FORTIFY_SOURCE=2 -fsanitize=thread \
186+
-O0 -fno-omit-frame-pointer -fno-color-diagnostics"
187+
# note: we need pathes in container, thus /rsyslog vs. $(pwd) in TSAN_OPTIONS
188+
export TSAN_OPTIONS="halt_on_error=1 suppressions=/rsyslog/tests/tsan-rt.supp"
189+
export ABORT_ALL_ON_TEST_FAIL='YES'
190+
;;
158191
'kafka_codecov')
159192
export RSYSLOG_DEV_CONTAINER='rsyslog/rsyslog_dev_base_ubuntu:22.04'
160193
export CI_VALGRIND_SUPPRESSIONS="ubuntu22.04.supp"

devtools/default_dev_container

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rsyslog/rsyslog_dev_base_ubuntu:20.04
1+
rsyslog/rsyslog_dev_base_ubuntu:24.04

0 commit comments

Comments
 (0)