diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-11-03 18:58:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-11-03 18:58:24 +0300 |
| commit | ec615b27d8630c37f9ef948527170483ebe0fbe0 (patch) | |
| tree | 480e6989aa63d809066e92f43510d5e6f402a00e /tools/ci/branches/ci_clang3x | |
| parent | 2f1687f3255064738d8b1b185ab7b2cedb79e313 (diff) | |
| download | manaplus-ec615b27d8630c37f9ef948527170483ebe0fbe0.tar.gz manaplus-ec615b27d8630c37f9ef948527170483ebe0fbe0.tar.bz2 manaplus-ec615b27d8630c37f9ef948527170483ebe0fbe0.tar.xz manaplus-ec615b27d8630c37f9ef948527170483ebe0fbe0.zip | |
Fix different issues in updated CI environments.
Ignore some clang and clang tidy warnings.
Diffstat (limited to 'tools/ci/branches/ci_clang3x')
| -rw-r--r-- | tools/ci/branches/ci_clang3x/.gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |