summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-29 01:06:22 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-29 01:06:22 +0300
commit9993fbc1d1bec556143d974f148869e1fb4c6307 (patch)
tree730296fbb5e47f64592ebb151ba41073228b2f0a
parent30d928c4903bb36ee78ff846384feff9cc9aa952 (diff)
downloadplus-9993fbc1d1bec556143d974f148869e1fb4c6307.tar.gz
plus-9993fbc1d1bec556143d974f148869e1fb4c6307.tar.bz2
plus-9993fbc1d1bec556143d974f148869e1fb4c6307.tar.xz
plus-9993fbc1d1bec556143d974f148869e1fb4c6307.zip
Replace some gcc5 to gcc6 in .gitlab-ci.yml
-rw-r--r--.gitlab-ci.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 377f43908..e0fdc0f92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -690,7 +690,7 @@ gcc-6_sanitize_i386:
gcc_eathena:
stage: build
script:
- - ./tools/ci/jobs/gcc5.sh --without-opengl --disable-tmwa --enable-eathena
+ - ./tools/ci/jobs/gcc6.sh --without-opengl --disable-tmwa
image: debian:unstable
artifacts:
paths:
@@ -723,7 +723,7 @@ gcc_cilkplus:
gcc_eathena_opengl:
stage: build
script:
- - ./tools/ci/jobs/gcc5.sh --with-opengl --disable-tmwa --enable-eathena
+ - ./tools/ci/jobs/gcc6.sh --with-opengl --disable-tmwa
image: debian:unstable
artifacts:
paths:
@@ -734,7 +734,7 @@ gcc_eathena_opengl:
gcc_eathena_opengl_sdl2:
stage: build
script:
- - ./tools/ci/jobs/gcc5_sdl2.sh --with-opengl --disable-tmwa --enable-eathena
+ - ./tools/ci/jobs/gcc5_sdl2.sh --with-opengl --disable-tmwa
image: debian:unstable
artifacts:
paths:
@@ -745,7 +745,7 @@ gcc_eathena_opengl_sdl2:
gcc_eathena_sdl2:
stage: build
script:
- - ./tools/ci/jobs/gcc5_sdl2.sh --without-opengl --disable-tmwa --enable-eathena
+ - ./tools/ci/jobs/gcc5_sdl2.sh --without-opengl --disable-tmwa
image: debian:unstable
artifacts:
paths:
@@ -756,7 +756,7 @@ gcc_eathena_sdl2:
gcc_portable:
stage: build
script:
- - ./tools/ci/jobs/gcc5.sh --with-opengl --enable-tmwa --enable-eathena --enable-portable=yes
+ - ./tools/ci/jobs/gcc6.sh --with-opengl --enable-tmwa --enable-portable=yes
image: debian:unstable
artifacts:
paths:
@@ -767,7 +767,7 @@ gcc_portable:
gcc_eathena_c++11:
stage: build
script:
- - ./tools/ci/jobs/gcc5_c++11.sh --without-opengl --disable-tmwa --enable-eathena
+ - ./tools/ci/jobs/gcc5_c++11.sh --without-opengl --disable-tmwa
image: debian:unstable
artifacts:
paths:
@@ -778,7 +778,7 @@ gcc_eathena_c++11:
gcc_eathena_sdl2_c++11:
stage: build
script:
- - ./tools/ci/jobs/gcc5_sdl2_c++11.sh --without-opengl --disable-tmwa --enable-eathena
+ - ./tools/ci/jobs/gcc5_sdl2_c++11.sh --without-opengl --disable-tmwa
image: debian:unstable
artifacts:
paths: