From 5b199d787028e61de541975daf251e8067ccd417 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Tue, 20 Feb 2018 11:26:18 +0100
Subject: [PATCH] * .gitlab-ci.yml: Ignore tags and use $CI_JOB_TOKEN.

---
 .gitlab-ci.yml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d3fdda68..8007a2877 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ stages:
 
 debian-stable-gcc:
   stage: build
+  only:
+    - branches
   except:
     - /wip/
   image: gadl/spot-debuild:stable
@@ -21,6 +23,8 @@ debian-stable-gcc:
 
 debian-unstable-gcc-coverage:
   stage: build
+  only:
+    - branches
   except:
     - /wip/
   image: gadl/spot-debuild
@@ -46,6 +50,8 @@ debian-unstable-gcc-coverage:
 
 arch-clang:
   stage: build
+  only:
+    - branches
   except:
     - /wip/
   image: registry.lrde.epita.fr/spot-arch
@@ -62,6 +68,8 @@ arch-clang:
 
 arch-gcc-glibcxxdebug:
   stage: build
+  only:
+    - branches
   except:
     - /wip/
   image: registry.lrde.epita.fr/spot-arch
@@ -79,6 +87,8 @@ arch-gcc-glibcxxdebug:
 
 mingw-shared:
   stage: build
+  only:
+    - branches
   except:
     - /wip/
   image: gadl/spot-debuild
@@ -94,6 +104,8 @@ mingw-shared:
 
 mingw-static:
   stage: build
+  only:
+    - branches
   except:
     - /wip/
   image: gadl/spot-debuild
@@ -116,6 +128,8 @@ mingw-static:
 
 debpkg-stable:
   stage: build
+  only:
+    - branches
   script:
     - docker pull gadl/spot-debuild:stable
     - docker pull gadl/spot-debuild-i386:stable
@@ -137,6 +151,8 @@ debpkg-stable:
 
 debpkg-unstable:
   stage: build
+  only:
+    - branches
   script:
     - docker pull gadl/spot-debuild
     - docker pull gadl/spot-debuild-i386
@@ -170,7 +186,7 @@ publish-stable:
     - dput lrde *.changes
     - tgz=`ls spot-*.tar.* | head -n 1`
     - case $tgz in *[0-9].tar.*) cp $tgz /lrde/dload/spot/;; esac
-    - curl -X POST -F ref=master -F token=$TRIGGER_SPOT_WEB -F "variables[skip_next]=1" https://gitlab.lrde.epita.fr/api/v4/projects/131/trigger/pipeline
+    - curl -X POST -F ref=master -F token=$CI_JOB_TOKEN -F "variables[skip_next]=1" https://gitlab.lrde.epita.fr/api/v4/projects/131/trigger/pipeline
 
 publish-unstable:
   only:
@@ -184,5 +200,5 @@ publish-unstable:
     - cd _build_unstable
     - ls -l
     - dput lrde *.changes
-    - curl -X POST -F ref=master -F token=$TRIGGER_SPOT_WEB -F "variables[skip_stable]=1" https://gitlab.lrde.epita.fr/api/v4/projects/131/trigger/pipeline
-    - curl -X POST -F ref=master -F token=$TRIGGER_SANDBOX https://gitlab.lrde.epita.fr/api/v4/projects/181/trigger/pipeline
+    - curl -X POST -F ref=master -F token=$CI_JOB_TOKEN -F "variables[skip_stable]=1" https://gitlab.lrde.epita.fr/api/v4/projects/131/trigger/pipeline
+    - curl -X POST -F ref=master -F token=$CI_JOB_TOKEN https://gitlab.lrde.epita.fr/api/v4/projects/181/trigger/pipeline