правки по ПР

.gitlab-ci.yml

 stages:
-  - publish-npm
+  - deploy
 
 publish_npm:
   image: "node:current-alpine"
-  stage: publish-npm
+  stage: deploy
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
   before_script:
-    - apk add --update bash
-    - apk add --update make
-    - apk add --update protobuf-dev
-    - apk add --update yarn
+    - apk add --update make bash protobuf-dev yarn
+    - npm install -g ts-proto@1.115.5
+    - npm install -g typescript@4.7.4
 
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:
         - config/package.json
   script:
-    - npm install -g ts-proto@1.115.5
-    - npm install -g typescript@4.7.4
     - mkdir config/dist
     - make proto
     - cd ./config

Makefile

@@ -14,10 +14,8 @@ TSC_MAJOR_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f1)
 TSC_MINOR_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f2)
 TSC_MIC_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f3)
 
-# Генерация js
-proto: proto-js
-
-proto-js: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js
+# Генерация
+proto: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js
 	@echo "Generated all protobuf JavaScrypt files"
 
 %.ts: %.proto