From 7ea88f4e338618ab04c763e3c1f770822b43b25d Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Thu, 15 Dec 2022 19:04:52 +0800
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B0=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8?=
=?UTF-8?q?=D1=8F=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=B4=D0=BB?=
=?UTF-8?q?=D1=8F=20frontend=20=D0=B2=20Makefile=20=D0=B8=20=D0=BF=D1=83?=
=?UTF-8?q?=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D1=8F=20npm-=D0=BF?=
=?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e15c5c3..b57dace 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ publish_npm:
- apk add --update yarn
rules:
- - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes:
- config/package.json
script:
@@ -22,6 +22,8 @@ publish_npm:
- mkdir config/dist
- make proto
- cd ./config
- - NPM_PACKAGE_VERSION=$(node -p "require('./package.json').version")
+ - NPM_PACKAGE_NAME=$(node -p "require('./package.json').name")
+ - NPM_PACKAGE_CURRENT_VERSION=$(npm show ${NPM_PACKAGE_NAME} version)
- yarn pub
- - echo "Successfully published version ${NPM_PACKAGE_VERSION} to GitLab's NPM registry"
\ No newline at end of file
+ - NPM_PACKAGE_VERSION=$(node -p "require('./package.json').version")
+ - echo "Successfully published version ${NPM_PACKAGE_VERSION} of ${NPM_PACKAGE_NAME} to GitLab's NPM registry"
\ No newline at end of file
--
GitLab