build: ci only build release branches, master, tags

2017-08-23 11:12:40 +00:00
parent 4037593a05
commit 78d1d72f54
1 changed files with 8 additions and 7 deletions
@@ -1,4 +1,3 @@
-
 variables:
    MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
    IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt591-llvm401
@@ -41,6 +40,10 @@ variables:

 build:Linux64:
    image: $IMAGE_64
+    only:
+        - /^release-.*$/
+        - master
+        - tags
    cache:
        key: cache_linux_64
        paths:
@@ -50,6 +53,10 @@ build:Linux64:

 build:Linux32:
    image: $IMAGE_32
+    only:
+        - /^release-.*$/
+        - master
+        - tags
    cache:
        key: cache_linux_32
        paths:
@@ -58,12 +65,6 @@ build:Linux32:
    when: manual
    <<: *build_def

-build:Linux32_tag:
-    image: $IMAGE_32
-    only:
-        - tags
-    <<: *build_def
-
 LicenseGenerator:
    image: $IMAGE_64
    stage: build