Skip to content

Commit e95edea

Browse files
authored
Enable ODR violation check in CI (+fix typo GHA CI) (#2084)
Return ODR violation check into CI builds
1 parent 7cbd7f8 commit e95edea

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/common_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
container_name: rockylinux:8
128128
build: true
129129
build_installer: false
130-
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize-undefined"
130+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize_undefined"
131131
gcc_version: 13
132132
shell: bash -l {0}
133133
trik_python3_version_minor: 11
@@ -144,7 +144,7 @@ jobs:
144144
build: true
145145
build_installer: true
146146
need_deploy: false
147-
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize-undefined CONFIG+=sanitize_address"
147+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
148148
gcc_version: 13
149149
trik_qt_version: 5.15
150150
trik_python3_version_minor: 11

buildScripts/github/run_tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ set -euo pipefail
33

44
export QT_QPA_PLATFORM=${QT_QPA_PLATFORM:-minimal}
55

6-
# dirty hack for libtrikQsLog and libtrikRuntimeQsLog
7-
export ASAN_OPTIONS=$(if [[ $RUNNER_OS == Linux ]]; then echo 'detect_leaks=1:'; else echo -n ''; fi)detect_stack_use_after_return=1:fast_unwind_on_malloc=0:detect_odr_violation=0
6+
export ASAN_OPTIONS=$(if [[ $RUNNER_OS == Linux ]]; then echo 'detect_leaks=1:'; else echo -n ''; fi)detect_stack_use_after_return=1:fast_unwind_on_malloc=0
87
export LSAN_OPTIONS=suppressions=$PWD/bin/lsan.supp:print_suppressions=0
98
export DISPLAY=:0
109
export TRIK_PYTHONPATH=${TRIK_PYTHONPATH:-$(python3.${TRIK_PYTHON3_VERSION_MINOR} -c 'import sys; import os; print(os.pathsep.join(sys.path))')}

0 commit comments

Comments
 (0)