From 8aea3bcbb79e3ee9c6645464636ab5bc6e714ef1 Mon Sep 17 00:00:00 2001
From: Guillaume Weber <gweber@takima.fr>
Date: Mon, 23 May 2022 15:45:16 +0200
Subject: [PATCH] ci: change release/pre-release strategy

---
 .gitlab-ci.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa305048..93f2d5c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,6 @@ build:
     - docker push $CI_REGISTRY_IMAGE/$VERSION:$TAG
   rules:
     - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_TAG != null
 
 desktop_extension:package:pre-release:
   stage: build
@@ -77,8 +76,7 @@ desktop_extension:package:release:
   script:
     - ./build-desktop.sh prod
   rules:
-    - if: $CI_COMMIT_BRANCH == "master"
-    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG =~ /^(?:\d+\.){2}(?:\d+)$/
 
 desktop_extension:publish:release:
   stage: publish
@@ -95,5 +93,4 @@ desktop_extension:publish:release:
     - cd $EXTENSION_PATH
     - npm run vsce-publish -- -p $VSCODE_EXTENSION_MARKET_PLACE_ACCESS_TOKEN
   rules:
-    - if: $CI_COMMIT_BRANCH == "master"
-    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG =~ /^(?:\d+\.){2}(?:\d+)$/
-- 
GitLab