From eff45dce1eda03a829ca09a0cd73412cc4d722d9 Mon Sep 17 00:00:00 2001
From: "@mazikiou" <mazikiou@takima.fr>
Date: Thu, 7 Jul 2022 15:46:40 +0200
Subject: [PATCH] ci: prioritized release over pre-release
---
.gitlab-ci.yml | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 239e44a8..1e211cf9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
- build
- publish
-
build:
stage: build
services:
@@ -26,11 +25,12 @@ build:
only:
- master
-desktop_extension:package:pre-release:
+desktop_extension:package:release:
stage: build
cache:
paths:
- $EXTENSION_PATH
+
policy: push
before_script:
- apk update
@@ -38,12 +38,11 @@ desktop_extension:package:pre-release:
- rm -f $EXTENSION_PATH/*.vsix
- npm install --prefix $EXTENSION_PATH
script:
- - ./build-desktop.sh staging
- only:
- - master
-
+ - ./build-desktop.sh prod
+ rules:
+ - if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG =~ "/^(?:\d+\.){2}(?:\d+)$/"
-desktop_extension:publish:pre-release:
+desktop_extension:publish:release:
stage: publish
cache:
paths:
@@ -56,17 +55,15 @@ desktop_extension:publish:pre-release:
- npm install --prefix $EXTENSION_PATH
script:
- cd $EXTENSION_PATH
- - npm run vsce-publish -- --pre-release -p $VSCODE_EXTENSION_MARKET_PLACE_ACCESS_TOKEN
- only:
- - master
-
+ - npm run vsce-publish -- -p $VSCODE_EXTENSION_MARKET_PLACE_ACCESS_TOKEN
+ rules:
+ - if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG =~ "/^(?:\d+\.){2}(?:\d+)$/"
-desktop_extension:package:release:
+desktop_extension:package:pre-release:
stage: build
cache:
paths:
- $EXTENSION_PATH
-
policy: push
before_script:
- apk update
@@ -74,11 +71,11 @@ desktop_extension:package:release:
- rm -f $EXTENSION_PATH/*.vsix
- npm install --prefix $EXTENSION_PATH
script:
- - ./build-desktop.sh prod
- rules:
- - if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG =~ "/^(?:\d+\.){2}(?:\d+)$/"
+ - ./build-desktop.sh staging
+ only:
+ - master
-desktop_extension:publish:release:
+desktop_extension:publish:pre-release:
stage: publish
cache:
paths:
@@ -91,6 +88,6 @@ desktop_extension:publish:release:
- npm install --prefix $EXTENSION_PATH
script:
- cd $EXTENSION_PATH
- - npm run vsce-publish -- -p $VSCODE_EXTENSION_MARKET_PLACE_ACCESS_TOKEN
- rules:
- - if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG =~ "/^(?:\d+\.){2}(?:\d+)$/"
+ - npm run vsce-publish -- --pre-release -p $VSCODE_EXTENSION_MARKET_PLACE_ACCESS_TOKEN
+ only:
+ - master
--
GitLab