diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a79fd0c571..ee3f70695e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,6 +56,7 @@ Ubuntu_GCC_preprocess: stage: build variables: CMAKE_EXE_LINKER_FLAGS: -fuse-ld=mold + OPENMW_CXX_FLAGS: "-Werror -Werror=implicit-fallthrough" script: - df -h - export CCACHE_BASEDIR="`pwd`" @@ -156,6 +157,8 @@ Ubuntu_GCC_asan: CMAKE_CXX_FLAGS_DEBUG: -g -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak CMAKE_EXE_LINKER_FLAGS: -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak -fuse-ld=mold BUILD_OPENMW_ONLY: 1 + # Disable -Werror due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562 + OPENMW_CXX_FLAGS: "" Clang_Format: extends: .Ubuntu_Image @@ -257,6 +260,8 @@ Ubuntu_GCC_tests_asan: CMAKE_CXX_FLAGS_DEBUG: -g -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak CMAKE_EXE_LINKER_FLAGS: -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak -fuse-ld=mold ASAN_OPTIONS: halt_on_error=1:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1 + # Disable -Werror due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562 + OPENMW_CXX_FLAGS: "" artifacts: paths: [] name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA} diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh index c6fd306e25..c5704b900c 100755 --- a/CI/before_script.linux.sh +++ b/CI/before_script.linux.sh @@ -17,7 +17,7 @@ declare -a CMAKE_CONF_OPTS=( -DBUILD_SHARED_LIBS="${BUILD_SHARED_LIBS:-OFF}" -DUSE_SYSTEM_TINYXML=ON -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON - -DOPENMW_CXX_FLAGS="-Werror -Werror=implicit-fallthrough" # flags specific to OpenMW project + -DOPENMW_CXX_FLAGS="${OPENMW_CXX_FLAGS}" # flags specific to OpenMW project ) if [[ "${CMAKE_EXE_LINKER_FLAGS}" ]]; then