From 3cb501a8487bd8d803d7456315149233c6fe5c35 Mon Sep 17 00:00:00 2001 From: "@mazikiou" <mazikiou@takima.fr> Date: Mon, 4 Jul 2022 16:35:13 +0200 Subject: [PATCH] fix: pipeline --- .gitlab-ci.yml | 10 +++------- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a435124f..d8c38190 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,13 +18,13 @@ build: - apk update - apk add nodejs npm - export TAG=${CI_COMMIT_TAG:-latest} - - ./setup.sh + - pwd + - ls -al + - sh 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 - only: - - master desktop_extension:package:pre-release: stage: build @@ -39,8 +39,6 @@ desktop_extension:package:pre-release: - npm install --prefix $EXTENSION_PATH script: - ./build-desktop.sh staging - only: - - master desktop_extension:publish:pre-release: @@ -57,8 +55,6 @@ desktop_extension:publish:pre-release: script: - cd $EXTENSION_PATH - npm run vsce-publish -- --pre-release -p $VSCODE_EXTENSION_MARKET_PLACE_ACCESS_TOKEN - only: - - master desktop_extension:package:release: diff --git a/package-lock.json b/package-lock.json index 392bf32c..2dcf508b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "deadlock-theia", + "name": "deadlock-desktop", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "deadlock-theia", + "name": "deadlock-desktop", "version": "1.0.0", "devDependencies": { "husky": "^7.0.4", diff --git a/package.json b/package.json index dcef3ebd..c2cbb2c4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "deadlock-theia", + "name": "deadlock-desktop", "version": "1.0.0", "description": "Deadlock Desktop projet basé sur notre propre image de Theia https://gitlab.takima.io/deadlock-public/deadlock-desktop.", "scripts": { -- GitLab