From 7579d9844839d34ac5fcfcc6e3037a6ddc381583 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Thu, 5 Mar 2020 03:21:41 +0000 Subject: [PATCH] gitlab-ci: upgrade to Clang 10, drop special -Wframe-larger-than case Requires an updated wireshark/wireshark-ubuntu-dev image: https://github.com/wireshark/wireshark-ubuntu-dev-docker/pull/2 Remove -Wframe-larger-than while at it. The default size in our CMake config is 32k. Clang should not significantly go over it. If so, then it has to be solved there, and not in the Gitlab config. Change-Id: I3891fcbd9dec8e5a4597404aa8131f28a1755a02 Reviewed-on: https://code.wireshark.org/review/36369 Reviewed-by: Peter Wu --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22f8bf8580..3f5face8de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,12 +45,11 @@ gcc-7-nopcap: CC: gcc-7 CXX: g++-7 -clang-8: +clang-10: <<: *build-ubuntu variables: - CMAKE_ARGS: -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 - CC: clang-8 - CXX: clang++-8 + CC: clang-10 + CXX: clang++-10 build:rpm-centos-7: <<: *build-rpm