From ec615b27d8630c37f9ef948527170483ebe0fbe0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 3 Nov 2018 18:58:24 +0300 Subject: Fix different issues in updated CI environments. Ignore some clang and clang tidy warnings. --- tools/ci/branches/ci_clang3x/.gitlab-ci.yml | 4 ++-- tools/ci/branches/ci_clang4_5/.gitlab-ci.yml | 1 + tools/ci/branches/ci_clang6/.gitlab-ci.yml | 16 ++++++++-------- tools/ci/jobs/clang39.sh | 1 + tools/ci/jobs/clang39.sh_c++11.sh | 1 + tools/ci/jobs/clang39_sdl2.sh | 1 + tools/ci/jobs/clang40.sh | 1 + tools/ci/jobs/clang60.sh | 1 + tools/ci/jobs/clang60_tests.sh | 1 + 9 files changed, 17 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml index 85451693e..3c7b805bd 100644 --- a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml @@ -21,7 +21,7 @@ clang-3.9: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: clang-3.9 libc++-dev libc++abi-dev + PACKAGES: gcc g++ clang-3.9 libc++-dev libc++abi-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev @@ -283,7 +283,7 @@ clang-3.9_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: clang-3.9 libc++-dev libc++abi-dev + PACKAGES: gcc g++ clang-3.9 libc++-dev libc++abi-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev diff --git a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml index 7c2a757c1..75bf01828 100644 --- a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml @@ -37,6 +37,7 @@ clang-5.0: - ./tools/ci/jobs/clang50.sh - ./tools/ci/scripts/runtests.sh <<: *job-push + image:stretch-backports variables: PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev make autoconf automake autopoint gettext diff --git a/tools/ci/branches/ci_clang6/.gitlab-ci.yml b/tools/ci/branches/ci_clang6/.gitlab-ci.yml index cccdbe23c..fbbfa8bee 100644 --- a/tools/ci/branches/ci_clang6/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang6/.gitlab-ci.yml @@ -20,7 +20,7 @@ clang-6.0_tests: - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame <<: *job-push variables: - PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev + PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev @@ -35,7 +35,7 @@ clang-6.0_tests_i386: <<: *job-push image: vicamo/debian:sid-i386 variables: - PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev + PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev @@ -49,7 +49,7 @@ clang-6.0_tests_sdl2: - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame <<: *job-push variables: - PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev + PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev @@ -64,7 +64,7 @@ clang-6.0_tests_sdl2_i386: <<: *job-push image: vicamo/debian:sid-i386 variables: - PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev + PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev @@ -79,7 +79,7 @@ clang-6.0: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev + PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev @@ -95,7 +95,7 @@ clang-6.0_i386: <<: *job-push image: vicamo/debian:sid-i386 variables: - PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev + PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev @@ -110,7 +110,7 @@ clang-6.0_sdl2: - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev + PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev @@ -126,7 +126,7 @@ clang-6.0_sdl2_i386: <<: *job-push image: vicamo/debian:sid-i386 variables: - PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev + PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh index 641f03afa..116436515 100755 --- a/tools/ci/jobs/clang39.sh +++ b/tools/ci/jobs/clang39.sh @@ -21,6 +21,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \ -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 \ -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 88d89f732..25a28a48c 100755 --- a/tools/ci/jobs/clang39.sh_c++11.sh +++ b/tools/ci/jobs/clang39.sh_c++11.sh @@ -22,6 +22,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \ -Wno-variadic-macros -Wno-double-promotion -Wno-attributes \ -Wpointer-bool-conversion \ +-Wno-c++98-compat -Wno-implicit-fallthrough \ -O3 -std=c++11 -Wno-c++98-compat-pedantic -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS" do_init diff --git a/tools/ci/jobs/clang39_sdl2.sh b/tools/ci/jobs/clang39_sdl2.sh index 64e37c73e..a5180690a 100755 --- a/tools/ci/jobs/clang39_sdl2.sh +++ b/tools/ci/jobs/clang39_sdl2.sh @@ -21,6 +21,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \ -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 \ -Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS" do_init diff --git a/tools/ci/jobs/clang40.sh b/tools/ci/jobs/clang40.sh index 76c558c45..907925361 100755 --- a/tools/ci/jobs/clang40.sh +++ b/tools/ci/jobs/clang40.sh @@ -21,6 +21,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \ -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \ -Wno-variadic-macros -Wno-double-promotion -Wno-attributes \ +-Wno-c++98-compat-pedantic \ -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 d6aaf79c1..af25ea546 100755 --- a/tools/ci/jobs/clang60.sh +++ b/tools/ci/jobs/clang60.sh @@ -26,6 +26,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign -Wno-variadic-macros -Wno-double-promotion -Wno-attributes -Wno-shadow-field \ -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" do_init diff --git a/tools/ci/jobs/clang60_tests.sh b/tools/ci/jobs/clang60_tests.sh index cc0e46968..20e59c427 100755 --- a/tools/ci/jobs/clang60_tests.sh +++ b/tools/ci/jobs/clang60_tests.sh @@ -26,6 +26,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign -Wno-variadic-macros -Wno-double-promotion -Wno-attributes -Wno-shadow-field \ -Wpointer-bool-conversion -fno-omit-frame-pointer \ -Wno-zero-as-null-pointer-constant \ +-Wno-c++98-compat-pedantic \ -ggdb3 -stdlib=libc++ $POST_CXXFLAGS" do_init -- cgit v1.2.3-60-g2f50