diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-07 01:35:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-07 01:35:43 +0300 |
| commit | 0ea2569615fb54cfd3d0606fb9cb86aee9efea4c (patch) | |
| tree | 48d45193fba37bc9c680c7eb960433ac774a1643 | |
| parent | 3e6ef37b28c085e969cf80779391ea64030434a7 (diff) | |
| download | manaverse-0ea2569615fb54cfd3d0606fb9cb86aee9efea4c.tar.gz manaverse-0ea2569615fb54cfd3d0606fb9cb86aee9efea4c.tar.bz2 manaverse-0ea2569615fb54cfd3d0606fb9cb86aee9efea4c.tar.xz manaverse-0ea2569615fb54cfd3d0606fb9cb86aee9efea4c.zip | |
Remove duplicates from .gitlab-ci.yml and fix some job names.
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc1fe09f7..15a943f5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -533,22 +533,6 @@ gcc_eathena_opengl_sdl2: tags: - docker -gcc_tmwa_sdl2: - stage: build - script: - - ./tools/ci/jobs/gcc5_sdl2.sh --without-opengl --enable-tmwa --disable-eathena - image: debian:unstable - tags: - - docker - -gcc_eathena: - stage: build - script: - - ./tools/ci/jobs/gcc5.sh --without-opengl --disable-tmwa --enable-eathena - image: debian:unstable - tags: - - docker - gcc_eathena_sdl2: stage: build script: @@ -2929,7 +2913,7 @@ deheader_withoutopengl_h: tags: - docker -deheader_cc: +deheader_withoutopengl_cc: stage: build script: - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DENABLE_MEM_DEBUG -DUSE_X11 -DTMWA_SUPPORT -DEATHENA_SUPPORT" @@ -3617,7 +3601,7 @@ deheader_sdl2_withoutopengl_h: tags: - docker -deheader_sdl2_cc: +deheader_sdl2_withoutopengl_cc: stage: build script: - export FLAGS="-DUNITTESTS -DENABLE_LIBXML -DENABLE_MEM_DEBUG -DUSE_X11 -DTMWA_SUPPORT -DEATHENA_SUPPORT -DUSE_SDL2" |