diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-03 18:44:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-05 00:05:00 +0300 |
| commit | b8d4caccc851d9bb2aed6f45ea0e8b5b45880f8f (patch) | |
| tree | b1ee254fbdc93768b302066f1e903225d1b8ccbe /.gitlab-ci.yml | |
| parent | 683016200b23b084679619ea299903f397f83643 (diff) | |
| download | manaplus-b8d4caccc851d9bb2aed6f45ea0e8b5b45880f8f.tar.gz manaplus-b8d4caccc851d9bb2aed6f45ea0e8b5b45880f8f.tar.bz2 manaplus-b8d4caccc851d9bb2aed6f45ea0e8b5b45880f8f.tar.xz manaplus-b8d4caccc851d9bb2aed6f45ea0e8b5b45880f8f.zip | |
Replace most clang 5.0 builds to clang 6.0 builds.
Add separate clang 5.0 build.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1da11943c..af1a2e041 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1450,13 +1450,13 @@ gcc-7_tests_valgrind_i386: tags: - docker -clang-5.0_tests: +clang-6.0_tests: stage: build script: - - ./tools/ci/jobs/clang50_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame <<: *job-push variables: - PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev + PACKAGES: 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 @@ -1464,14 +1464,14 @@ clang-5.0_tests: tags: - docker -clang-5.0_tests_i386: +clang-6.0_tests_i386: stage: build script: - - ./tools/ci/jobs/clang50_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame <<: *job-push image: vicamo/debian:sid-i386 variables: - PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev + PACKAGES: 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 @@ -1479,13 +1479,13 @@ clang-5.0_tests_i386: tags: - docker -clang-5.0_tests_sdl2: +clang-6.0_tests_sdl2: stage: build script: - - ./tools/ci/jobs/clang50_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame <<: *job-push variables: - PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev + PACKAGES: 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 @@ -1493,14 +1493,14 @@ clang-5.0_tests_sdl2: tags: - docker -clang-5.0_tests_sdl2_i386: +clang-6.0_tests_sdl2_i386: stage: build script: - - ./tools/ci/jobs/clang50_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame <<: *job-push image: vicamo/debian:sid-i386 variables: - PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev + PACKAGES: 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 @@ -2583,15 +2583,30 @@ clang-5.0: tags: - docker -clang-5.0_i386: +clang-6.0: stage: build script: - - ./tools/ci/jobs/clang50.sh + - ./tools/ci/jobs/clang60.sh + - ./tools/ci/scripts/runtests.sh + <<: *job-push + variables: + PACKAGES: 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 + gdb valgrind netcat-openbsd procps + tags: + - docker + +clang-6.0_i386: + stage: build + script: + - ./tools/ci/jobs/clang60.sh - ./tools/ci/scripts/runtests.sh <<: *job-push image: vicamo/debian:sid-i386 variables: - PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev + PACKAGES: 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 |