diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-12-19 18:35:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-12-19 19:48:35 +0300 |
| commit | 7452d72094e256366cc6d30a3f4f48feee82210e (patch) | |
| tree | 882c18cdb62d4c7f441b1e0ec5020f51e375213c | |
| parent | d6138db85ae0f95f7fce99ba04a7b06c4779b953 (diff) | |
| download | manaplus-7452d72094e256366cc6d30a3f4f48feee82210e.tar.gz manaplus-7452d72094e256366cc6d30a3f4f48feee82210e.tar.bz2 manaplus-7452d72094e256366cc6d30a3f4f48feee82210e.tar.xz manaplus-7452d72094e256366cc6d30a3f4f48feee82210e.zip | |
Add ci jobs with gcc 5 and 6 and cilk plus.
| -rw-r--r-- | .gitlab-ci.yml | 26 | ||||
| -rwxr-xr-x | tools/ci/jobs/gcc5.sh | 2 |
2 files changed, 21 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1240b7d1..e175018c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -462,7 +462,7 @@ cmake_gcc-4.9: gcc-5: stage: build script: - - ./tools/ci/jobs/gcc5.sh + - ./tools/ci/jobs/gcc5.sh --enable-werror image: debian:unstable <<: *log-failed-jobs @@ -561,38 +561,52 @@ gcc_eathena: gcc_without_mumble: stage: build script: - - ./tools/ci/jobs/gcc5.sh --without-mumble + - ./tools/ci/jobs/gcc5.sh --without-mumble --enable-werror image: debian:unstable <<: *log-failed-jobs gcc_without_customnls: stage: build script: - - ./tools/ci/jobs/gcc5.sh --enable-customnls + - ./tools/ci/jobs/gcc5.sh --enable-customnls --enable-werror image: debian:unstable <<: *log-failed-jobs gcc_without_customnls_nonls: stage: build script: - - ./tools/ci/jobs/gcc5.sh --enable-customnls --disable-nls + - ./tools/ci/jobs/gcc5.sh --enable-customnls --disable-nls --enable-werror image: debian:unstable <<: *log-failed-jobs gcc_without_opengl: stage: build script: - - ./tools/ci/jobs/gcc5.sh --without-opengl + - ./tools/ci/jobs/gcc5.sh --without-opengl --enable-werror image: debian:unstable <<: *log-failed-jobs -gcc_cilkplus: +gcc49_cilkplus: stage: build script: - ./tools/ci/jobs/gcc49.sh --enable-cilkplus image: debian:stable <<: *log-failed-jobs +gcc-5_cilkplus: + stage: build + script: + - ./tools/ci/jobs/gcc5.sh --enable-cilkplus + image: debian:unstable + <<: *log-failed-jobs + +gcc-6_cilkplus: + stage: build + script: + - ./tools/ci/jobs/gcc6.sh --enable-cilkplus + image: debian:unstable + <<: *log-failed-jobs + gcc_eathena_opengl: stage: build script: diff --git a/tools/ci/jobs/gcc5.sh b/tools/ci/jobs/gcc5.sh index ff04f9747..0fab3f9d4 100755 --- a/tools/ci/jobs/gcc5.sh +++ b/tools/ci/jobs/gcc5.sh @@ -46,7 +46,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -Wno-variadic-macros -Wno-zero-as-null-pointer-constant" do_init -run_configure --enable-werror $* +run_configure $* run_make source ./tools/ci/scripts/exit.sh |