summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-01 13:31:09 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-01 13:31:09 +0300
commit89138f2fbeec54fa8062bdc37a9ec630afbb0848 (patch)
tree704e83ba29f5ce2293d18a18e37e7cce26777e30
parent3fdeed3159bae9d9d9951a062fa7ce0c65e01cc2 (diff)
downloadplus-89138f2fbeec54fa8062bdc37a9ec630afbb0848.tar.gz
plus-89138f2fbeec54fa8062bdc37a9ec630afbb0848.tar.bz2
plus-89138f2fbeec54fa8062bdc37a9ec630afbb0848.tar.xz
plus-89138f2fbeec54fa8062bdc37a9ec630afbb0848.zip
Into .gitlab-ci.yml add prebuild stage with simple gcc 6 and clang builds.
-rw-r--r--.gitlab-ci.yml27
1 files changed, 15 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e3a32804..739fbc711 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
stages:
+ - prebuild
- build
- test
- success
@@ -7,6 +8,20 @@ stages:
before_script:
- uname -a
+# pre build
+
+clang-3.9:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/clang39.sh
+ image: debian:unstable
+
+gcc-6:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/gcc6.sh
+ image: debian:unstable
+
# simple builds
gcc-4.4:
@@ -57,12 +72,6 @@ clang-3.5:
- ./tools/ci/jobs/clang35.sh
image: debian:stable
-clang-3.9:
- stage: build
- script:
- - ./tools/ci/jobs/clang39.sh
- image: debian:unstable
-
.clang-3.9_c++11:
stage: build
script:
@@ -129,12 +138,6 @@ gcc-snapshot_sdl2:
- ./tools/ci/jobs/gccsnapshot_sdl2.sh
image: debian:unstable
-gcc-6:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6.sh
- image: debian:unstable
-
gcc-5_sanitize:
stage: build
script: