summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-31 03:25:48 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-31 03:26:39 +0300
commitf5ec274b558ea72fe961293f1ee4dca518728277 (patch)
tree1b8b1950a5f42fe96da0018c8eea80106c27c892 /.gitlab-ci.yml
parentf6304356a6f316431c42151fc51e276725770b76 (diff)
downloadplus-f5ec274b558ea72fe961293f1ee4dca518728277.tar.gz
plus-f5ec274b558ea72fe961293f1ee4dca518728277.tar.bz2
plus-f5ec274b558ea72fe961293f1ee4dca518728277.tar.xz
plus-f5ec274b558ea72fe961293f1ee4dca518728277.zip
Remove from .gitlab-ci.yml some without-opengl builds because they present in circleci.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml40
1 files changed, 0 insertions, 40 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b341e217..ec1434241 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -706,35 +706,6 @@ gcc-6_tests_glibcdebug_i386:
tags:
- docker
-gcc-6_tests_no_opengl:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- 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
- valgrind
- tags:
- - docker
-
-gcc-6_tests_no_opengl_i386:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
- image: vicamo/debian:sid-i386
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- 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
- valgrind
- tags:
- - docker
-
gcc-6_sdl2_tests_gcov:
stage: build
script:
@@ -1553,17 +1524,6 @@ gcc_without_customnls_nonls:
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
-gcc_without_opengl:
- stage: build
- script:
- - ./tools/ci/jobs/gcc5.sh --without-opengl --enable-werror
- <<: *job-shared
- variables:
- PACKAGES: gcc-5 g++-5
- 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
-
gcc49_cilkplus:
stage: build
script: