From 52ee255d7e6d03117533844368abf53c59e8e24b Mon Sep 17 00:00:00 2001
From: Erwan Georget <egeorget@opmbx.org>
Date: Mon, 7 Nov 2016 20:56:17 +0100
Subject: [PATCH] CI goodness for all

---
 .gitlab-ci.yml | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49567f060..55a6906a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,8 @@ stages:
 # Job de compilation pour Linux
 Linux client build:
   stage: build
-  only:
-    - develop
-    - /^release\/.*/
-    - /^feature\/.*(\+CI$|\+CI-LIN64.*)/
-    - tags
+  except:
+    - ryzomcore
   tags:
     - Docker
   image: ubuntu:14.04
@@ -55,8 +52,6 @@ Linux client build:
 OSX client build:
   stage: build
   only:
-    - develop
-    - /^feature\/.*(\+CI$|\+CI-OSX.*)/
     - tags
   tags:
     - OSX
@@ -78,11 +73,8 @@ OSX client build:
 
 Linux client test:
   stage: test
-  only:
-    - develop
-    - /^release\/.*/
-    - /^feature\/.*(\+CI$|\+CI-LIN64.*)/
-    - tags
+  except:
+    - ryzomcore
   tags:
     - Docker
   image: ubuntu:14.04
@@ -94,11 +86,8 @@ Linux client test:
     
 .OSX client test:
   stage: test
-  only:
-    - develop
-    - /^release\/.*/
-    - /^feature\/.*(\+CI$|\+CI-LIN64.*)/
-    - tags
+  except:
+    - ryzomcore
   tags:
     - OSX
   script:
@@ -113,10 +102,8 @@ Linux client test:
 .Deploy to Staging:
   stage: staging
   environment: Staging
-  only:
-    - develop
-    - /^release\/.*/
-    - tags
+  except:
+    - ryzomcore
   tags:
     - Docker
   image: ubuntu:14.04