From 3d005897e08269bb4939866ca7d870bbe0da8c3e Mon Sep 17 00:00:00 2001
From: Lansana DIOMANDE <ldiomande@takima.fr>
Date: Mon, 16 May 2022 15:48:54 +0200
Subject: [PATCH] fix: improve pipeline
---
.gitlab-ci.yml | 60 ++++++++++++-------
.../deadlock-extension/package.json | 2 +-
2 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ede1f7d5..8ff5beea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,28 +6,26 @@ stages:
- build
- publish
-before_script:
- - apk update
- - apk add nodejs npm
- - apk add yarn
- - apk add curl
- - export TAG=${CI_COMMIT_TAG:-latest}
- - ./setup.sh
- - rm -f $EXTENSION_PATH/*.vsix
-build:
- stage: build
- services:
- - docker:18.09.6-dind
- variables:
- VERSION: "desktop"
- script:
- - ./build.sh $TAG desktop $CI_REGISTRY_IMAGE
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $REGISTRY
- - docker push $CI_REGISTRY_IMAGE/$VERSION:$TAG
- rules:
- - if: $CI_COMMIT_BRANCH == "main"
- - if: $CI_COMMIT_TAG != null
+#build:
+# stage: build
+# services:
+# - docker:18.09.6-dind
+# variables:
+# VERSION: "desktop"
+#
+# before_script:
+# - apk update
+# - apk add nodejs npm
+# - export TAG=${CI_COMMIT_TAG:-latest}
+# - ./setup.sh
+# script:
+# - ./build.sh $TAG desktop $CI_REGISTRY_IMAGE
+# - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $REGISTRY
+# - 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
@@ -35,7 +33,11 @@ desktop_extension:package:pre-release:
paths:
- $EXTENSION_PATH
policy: push
-
+ before_script:
+ - apk update
+ - apk add nodejs npm
+ - rm -f $EXTENSION_PATH/*.vsix
+ - npm install --prefix $EXTENSION_PATH
script:
- ./build-desktop.sh staging
rules:
@@ -49,6 +51,11 @@ desktop_extension:publish:pre-release:
paths:
- $EXTENSION_PATH
policy: pull
+
+ before_script:
+ - apk update
+ - apk add nodejs npm
+ - npm install --prefix $EXTENSION_PATH
script:
- cd $EXTENSION_PATH
- npm run vsce-publish -- --pre-release -p $VSCODE_EXTENSION_MARKET_PLACE_ACCESS_TOKEN
@@ -62,8 +69,12 @@ desktop_extension:package:release:
cache:
paths:
- $EXTENSION_PATH
+
policy: push
before_script:
+ - apk update
+ - apk add nodejs npm
+ - rm -f $EXTENSION_PATH/*.vsix
- npm install --prefix $EXTENSION_PATH
script:
- ./build-desktop.sh prod
@@ -76,6 +87,11 @@ desktop_extension:publish:release:
paths:
- $EXTENSION_PATH
policy: pull
+
+ before_script:
+ - apk update
+ - apk add nodejs npm
+ - npm install --prefix $EXTENSION_PATH
script:
- cd $EXTENSION_PATH
- npm run vsce-publish -- -p $VSCODE_EXTENSION_MARKET_PLACE_ACCESS_TOKEN
diff --git a/deadlock-plugins/deadlock-extension/package.json b/deadlock-plugins/deadlock-extension/package.json
index a1f51762..9fb9534f 100644
--- a/deadlock-plugins/deadlock-extension/package.json
+++ b/deadlock-plugins/deadlock-extension/package.json
@@ -17,7 +17,7 @@
"onWebviewPanel:deadlockHelp",
"onStartupFinished"
],
- "main": "./out/main.js",
+ "main": "out/main.js",
"contributes": {
"commands": [
{
--
GitLab