fix

.gitlab-ci.yml

@@ -10,13 +10,13 @@ publish_npm:
     - apk add --update make bash protobuf-dev yarn
     - npm install -g ts-proto@1.115.5
     - npm install -g typescript@4.7.4
+    - npm i protobufjs@6.11.3
 
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:
         - config/package.json
   script:
-    - mkdir config/dist
     - make proto
     - cd ./config
     - |

Makefile

@@ -4,6 +4,7 @@ SHELL = /bin/bash -o pipefail
 PROTODIR=perxis-proto/proto
 DSTDIR=config/dist
 
+
 ALLPROTO?=$(shell find $(PROTODIR) -name '*.proto' )
 PROTOFILES=	$(filter-out proto/status/status.proto, $(ALLPROTO))
 PROTOTSFILES=$(ALLPROTO:.proto=.ts)
@@ -13,6 +14,7 @@ PROTOC_MINOR_VERSION=$(shell protoc --version | awk '{print $$2;}' | cut -d. -f2
 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)
+$(shell mkdir $(DSTDIR))
 
 # Генерация
 proto: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js

config/generate.sh

@@ -23,26 +23,20 @@ generate_index() {
 
       if [ "$segment" == "$base" ]; then
         exp="export * from './$exac'"
-        if grep -Fxq "$exp" "$dir"/index.ts; then
-          echo "$exp" "-> current expression-string already exist in index.ts"
-        else
+        if ! grep -Fxq "$exp" "$dir"/index.ts; then
           echo "$exp" | tee -a "$dir"/index.ts
         fi
         p=""
       elif [ "$segment" == "$exac" ]; then
         exp="export * as $segment from './$segment'"
-        if grep -Fxq "$exp" "$p"/index.ts; then
-          echo "$exp" "-> current expression-string already exist in index.ts"
-        else
+        if ! grep -Fxq "$exp" "$p"/index.ts; then
            echo "$exp" | tee -a "$p"/index.ts
         fi
         p+="$segment"
         p+="/"
       else
         exp="export * as $segment from './$segment'"
-        if grep -Fxq "$exp" "$p"index.ts; then
-          echo "$exp" "-> current expression-string already exist in index.ts"
-        else
+        if ! grep -Fxq "$exp" "$p"index.ts; then
           echo "$exp" | tee -a "$p"index.ts
         fi
         p+="$segment"
@@ -53,29 +47,16 @@ generate_index() {
   done
 }
 
-echo "---deleting existing *.d.ts, *.d.ts.map, *.js, *.js.map files"
-find ./config/dist/*/**/ -path '*.d.ts' -delete
-find ./config/dist/*/**/ -path '*.d.ts.map' -delete
-find ./config/dist/*/**/ -path '*.js' -delete
-find ./config/dist/*/**/ -path '*.js.map' -delete
-find ./config/dist/*/**/ -path '*.ts.bak' -delete
-find ./config/dist -path '*.d.ts' -delete
-find ./config/dist -path '*.d.ts.map' -delete
-find ./config/dist -path '*.js' -delete
-find ./config/dist -path '*.js.map' -delete
-find ./config/dist -path '*.ts.bak' -delete
 
 echo "Generate index.ts files"
 ts_files=$(find ./config/dist/**/ -name '*.ts')
 ts_files_array=($ts_files)
 generate_index "${ts_files_array[@]}"
 
-echo "---generating *.d.ts, *.d.ts.map, *.js, *.js.map files"
-npm i protobufjs@6.11.3
+echo "Generate *.d.ts, *.d.ts.map, *.js, *.js.map files"
 tsc --project ./config --declaration --declarationMap --sourceMap --rootDir ./config/dist
 
-echo "---deleting created tmp files"
-npm uninstall protobufjs@6.11.3
+echo "Delete created tmp files"
 find ./config/dist -name 'index.ts' -delete
 find ./config/dist/*/** -name 'index.ts' -delete
 find ./config/ -maxdepth 1 -name 'index.ts' -delete