diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-28 02:56:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-28 02:56:59 +0300 |
| commit | 9823fe67d70f06a759f6c0bb73b4c18cef487fe5 (patch) | |
| tree | 7623f6dfeb3cc210044dfa240e9a12da11382266 /.gitlab-ci.yml | |
| parent | ea989fce76cf0eec59a7104a5c521809ed2657a5 (diff) | |
| download | manaplus-9823fe67d70f06a759f6c0bb73b4c18cef487fe5.tar.gz manaplus-9823fe67d70f06a759f6c0bb73b4c18cef487fe5.tar.bz2 manaplus-9823fe67d70f06a759f6c0bb73b4c18cef487fe5.tar.xz manaplus-9823fe67d70f06a759f6c0bb73b4c18cef487fe5.zip | |
Fix stage for some jobs in .gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42a2e03f9..ba6fd2b4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1741,7 +1741,7 @@ gentoo_gcc-4.9_tests_sdl2: # simple builds gcc-gentoo_sdl1: - stage: prebuild + stage: build script: - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh @@ -1758,7 +1758,7 @@ gcc-gentoo_sdl1: - docker gcc-gentoo_sdl2: - stage: prebuild + stage: build script: - ./tools/ci/jobs/any_compiler.sh --with-sdl2 --enable-werror - ./tools/ci/scripts/runtests.sh @@ -2955,7 +2955,7 @@ gcc-5_h_sdl2_without_opengl: libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev gcc-5_h_all_tests: - stage: prebuild + stage: build script: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL <<: *job-push @@ -2966,7 +2966,7 @@ gcc-5_h_all_tests: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gcc-5_h_all_tests_i386: - stage: prebuild + stage: build script: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL image: vicamo/debian:sid-i386 |