From 4c7ade72bfd62aa236ac98f6a7248443e433e1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@inrae.fr>
Date: Tue, 25 Aug 2020 14:34:30 +0200
Subject: [PATCH] Distingue la publication de tags et de branches dans Gitlab.

---
 .gitlab-ci.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2c3450..5505e7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,19 @@ include:
     ref: "3.0.1"
     file: /php/packagist.yml
 
-gitlab-composer:
+.gitlab-composer:
   stage: deploy
   image: curlimages/curl
   interruptible: false
-  script:
-    - 'curl --user "__token__:$CI_JOB_TOKEN" --data "tag=$CI_COMMIT_TAG" --data "branch=$CI_COMMIT_BRANCH" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/composer"'
+
+gitlab-composer-tag:
+  extends: [.gitlab-composer]
+  script: 'curl --user "__token__:$CI_JOB_TOKEN" --data "tag=$CI_COMMIT_TAG" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/composer"'
+  rules:
+    - if: '$CI_COMMIT_TAG'
+
+gitlab-composer-branch:
+  extends: [.gitlab-composer]
+  script: 'curl --user "__token__:$CI_JOB_TOKEN" --data "branch=$CI_COMMIT_BRANCH" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/composer"'
   rules:
-    - if: '$CI_COMMIT_BRANCH || $CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH'
-- 
GitLab