From a2d5c5474faf099788f24289e7d85c08057e4ac5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 17 Mar 2017 16:56:57 +0300 Subject: Restore prebuild stage in .gitlab-ci.yml --- .gitlab-ci.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 839416a3d..010ef424e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ variables: # pre build gcc-5_c++11_i386: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc5_c++11.sh image: vicamo/debian:sid-i386 @@ -65,7 +65,7 @@ gcc-5_c++11_i386: - docker gcc-6-i386: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc6.sh image: vicamo/debian:sid-i386 @@ -79,7 +79,7 @@ gcc-6-i386: - docker clang-3.9: - stage: build + stage: prebuild script: - ./tools/ci/jobs/clang39.sh <<: *job-shared @@ -90,7 +90,7 @@ clang-3.9: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gcc-6: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc6.sh <<: *job-shared @@ -101,7 +101,7 @@ gcc-6: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gcc-6_physfs: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc6.sh --with-physfs <<: *job-shared @@ -113,7 +113,7 @@ gcc-6_physfs: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gcc-4.4: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc44.sh image: debian:oldstable @@ -127,7 +127,7 @@ gcc-4.4: - docker mxe_gcc5_shared_32: - stage: build + stage: prebuild script: - ls /mxe - ./tools/ci/jobs/mxe_gcc5.sh @@ -140,7 +140,7 @@ mxe_gcc5_shared_32: - docker mxe_gcc5_shared_64: - stage: build + stage: prebuild script: - ls /mxe - ./tools/ci/jobs/mxe_gcc5.sh @@ -153,7 +153,7 @@ mxe_gcc5_shared_64: - docker gcc-5_sdl2: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc5_sdl2.sh <<: *job-shared @@ -164,7 +164,7 @@ gcc-5_sdl2: libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev gcc-6_game_only: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc6.sh --without-dyecmd <<: *job-shared @@ -175,7 +175,7 @@ gcc-6_game_only: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gcc-6_dyecmd_only: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc6.sh --without-manaplusgame <<: *job-shared @@ -186,7 +186,7 @@ gcc-6_dyecmd_only: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev mplint_po: - stage: build + stage: prebuild script: - ./tools/ci/jobs/mplint.sh po <<: *job-shared @@ -195,7 +195,7 @@ mplint_po: make autoconf automake autopoint gettext mplint_src: - stage: build + stage: prebuild script: - ./tools/ci/jobs/mplint.sh src <<: *job-shared @@ -204,7 +204,7 @@ mplint_src: make autoconf automake autopoint gettext mplint_data: - stage: build + stage: prebuild script: - ./tools/ci/jobs/mplint.sh data <<: *job-shared @@ -213,7 +213,7 @@ mplint_data: make autoconf automake autopoint gettext cpplint: - stage: build + stage: prebuild script: - ./tools/ci/jobs/cpplint.sh <<: *job-shared @@ -221,7 +221,7 @@ cpplint: PACKAGES: python wget gcc-5_h_all: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML <<: *job-shared @@ -232,7 +232,7 @@ gcc-5_h_all: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gcc-5_h_all_i386: - stage: build + stage: prebuild script: - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML image: vicamo/debian:sid-i386 @@ -246,7 +246,7 @@ gcc-5_h_all_i386: - docker pngcheck: - stage: build + stage: prebuild script: - ./tools/ci/jobs/pngcheck.sh <<: *job-shared @@ -254,7 +254,7 @@ pngcheck: PACKAGES: pngcheck icccheck: - stage: build + stage: prebuild script: - ./tools/ci/jobs/imagemagiccheck.sh <<: *job-shared -- cgit v1.2.3-60-g2f50