summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-11-04 04:17:27 +0300
committerAndrei Karas <akaras@inbox.ru>2018-11-04 08:00:53 +0300
commit33f4a30373c8978d4e4f29422a5b0132fd14a0ec (patch)
tree7bb3443f52282412db06e16b3f0d29d590d38a75 /tools/ci
parentc6043c3335fd60aaa8c0a87c8afd0a0b4aa25adc (diff)
downloadplus-33f4a30373c8978d4e4f29422a5b0132fd14a0ec.tar.gz
plus-33f4a30373c8978d4e4f29422a5b0132fd14a0ec.tar.bz2
plus-33f4a30373c8978d4e4f29422a5b0132fd14a0ec.tar.xz
plus-33f4a30373c8978d4e4f29422a5b0132fd14a0ec.zip
Fix clang39, clang60 ci scripts and clang-tidy configuration.
Diffstat (limited to 'tools/ci')
-rwxr-xr-xtools/ci/jobs/clang39.sh4
-rwxr-xr-xtools/ci/jobs/clang39.sh_c++11.sh2
-rwxr-xr-xtools/ci/jobs/clang39_sdl2.sh4
-rwxr-xr-xtools/ci/jobs/clang60.sh2
-rwxr-xr-xtools/ci/jobs/clang60_tests.sh2
5 files changed, 7 insertions, 7 deletions
diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh
index 116436515..8345437ae 100755
--- a/tools/ci/jobs/clang39.sh
+++ b/tools/ci/jobs/clang39.sh
@@ -18,10 +18,10 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
-Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
-Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
-Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
--Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
+-Wno-disabled-macro-expansion -Wno-format-nonliteral \
-Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
-Wno-variadic-macros -Wno-double-promotion -Wno-attributes \
--Wno-c++98-compat -Wno-implicit-fallthrough \
+-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-implicit-fallthrough \
-Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
do_init
diff --git a/tools/ci/jobs/clang39.sh_c++11.sh b/tools/ci/jobs/clang39.sh_c++11.sh
index 25a28a48c..95343ccd9 100755
--- a/tools/ci/jobs/clang39.sh_c++11.sh
+++ b/tools/ci/jobs/clang39.sh_c++11.sh
@@ -18,7 +18,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
-Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
-Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
-Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
--Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
+-Wno-disabled-macro-expansion -Wno-format-nonliteral \
-Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
-Wno-variadic-macros -Wno-double-promotion -Wno-attributes \
-Wpointer-bool-conversion \
diff --git a/tools/ci/jobs/clang39_sdl2.sh b/tools/ci/jobs/clang39_sdl2.sh
index a5180690a..c7a05170b 100755
--- a/tools/ci/jobs/clang39_sdl2.sh
+++ b/tools/ci/jobs/clang39_sdl2.sh
@@ -18,10 +18,10 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
-Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
-Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
-Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
--Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
+-Wno-disabled-macro-expansion -Wno-format-nonliteral \
-Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
-Wno-variadic-macros -Wno-double-promotion -Wno-attributes \
--Wno-c++98-compat -Wno-implicit-fallthrough \
+-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-implicit-fallthrough \
-Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
do_init
diff --git a/tools/ci/jobs/clang60.sh b/tools/ci/jobs/clang60.sh
index af25ea546..486fb05b7 100755
--- a/tools/ci/jobs/clang60.sh
+++ b/tools/ci/jobs/clang60.sh
@@ -27,7 +27,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
-Wpointer-bool-conversion -fno-omit-frame-pointer -Wno-c++98-compat-pedantic \
-Wno-implicit-fallthrough -Wno-zero-as-null-pointer-constant \
-Wno-c++98-compat-pedantic \
--ggdb3 -stdlib=libc++ $POST_CXXFLAGS"
+-ggdb3 $POST_CXXFLAGS"
do_init
run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang60_tests.sh b/tools/ci/jobs/clang60_tests.sh
index 20e59c427..59aebe4ae 100755
--- a/tools/ci/jobs/clang60_tests.sh
+++ b/tools/ci/jobs/clang60_tests.sh
@@ -27,7 +27,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
-Wpointer-bool-conversion -fno-omit-frame-pointer \
-Wno-zero-as-null-pointer-constant \
-Wno-c++98-compat-pedantic \
--ggdb3 -stdlib=libc++ $POST_CXXFLAGS"
+-ggdb3 $POST_CXXFLAGS"
do_init
run_configure --enable-unittests=yes $*