diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-14 18:35:17 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-14 18:35:17 +0300 |
| commit | 2bf7211bdc2603f4d6f438d6aa7ae089104c69dd (patch) | |
| tree | 7b7c65fe94994f248f00fa332417c1497a563763 | |
| parent | e054e2e3720c2d1d2bd817a6d7a9701935f44d9e (diff) | |
| download | manaplus-2bf7211bdc2603f4d6f438d6aa7ae089104c69dd.tar.gz manaplus-2bf7211bdc2603f4d6f438d6aa7ae089104c69dd.tar.bz2 manaplus-2bf7211bdc2603f4d6f438d6aa7ae089104c69dd.tar.xz manaplus-2bf7211bdc2603f4d6f438d6aa7ae089104c69dd.zip | |
Move gcc-5_c++11_i386 ci script into prebuild stage and gcc-5 back to build.
| -rw-r--r-- | .gitlab-ci.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9230e9e9c..9ca7977a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,14 @@ clang-3.9: tags: - docker +gcc-5_c++11_i386: + stage: prebuild + script: + - ./tools/ci/jobs/gcc5_c++11.sh + image: vicamo/debian:sid-i386 + tags: + - docker + gcc-6: stage: prebuild script: @@ -82,14 +90,6 @@ gcc-5_h_all_i386: tags: - docker -gcc-5: - stage: prebuild - script: - - ./tools/ci/jobs/gcc5.sh - image: debian:unstable - tags: - - docker - pngcheck: stage: prebuild script: @@ -276,19 +276,19 @@ cmake_gcc-4.9: tags: - docker -gcc-5_c++11: +gcc-5: stage: build script: - - ./tools/ci/jobs/gcc5_c++11.sh + - ./tools/ci/jobs/gcc5.sh image: debian:unstable tags: - docker -gcc-5_c++11_i386: +gcc-5_c++11: stage: build script: - ./tools/ci/jobs/gcc5_c++11.sh - image: vicamo/debian:sid-i386 + image: debian:unstable tags: - docker |