fix .gitlab-ci.yml

.gitlab-ci.yml

@@ -20,8 +20,6 @@ publish_npm:
     - mkdir config/clients
     - make proto
     - cd ./config
-    - cd ./clients
-    - ls
     - NPM_PACKAGE_VERSION=$(node -p "require('./package.json').version")
     - yarn pub
     - echo "Successfully published version ${NPM_PACKAGE_VERSION} to GitLab's NPM registry"

Makefile

@@ -17,11 +17,10 @@ TSC_MIC_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f3)
 # Генерация js
 proto: proto-js
 
-proto-js: protoc-check js-check generate-js $(PROTOTSFILES)
+proto-js: protoc-check js-check $(PROTOTSFILES) generate-js
 	@echo "Generated all protobuf JavaScrypt files"
 
 %.ts: %.proto
-	@echo "Generating ts files"
 	@protoc -I=$(PROTODIR) \
 	--plugin=@protoc-gen-ts_proto \
  	--ts_proto_opt=env=browser,outputServices=generic-definitions,outputJsonMethods=false,esModuleInterop=true,useOptionals=messages,exportCommonSymbols=false,useDate=false,useExactTypes=false \

config/generate.sh

@@ -78,5 +78,7 @@ echo "---deleting created tmp files"
 npm uninstall protobufjs@6.11.3
 find ./config/clients -name 'index.ts' -delete
 find ./config/clients/*/** -name 'index.ts' -delete
+find ./ -maxdepth 1 -name '*.json' -delete
+find ./ -maxdepth 1 -name '*.ts' -delete
 
 echo "---process finished"
\ No newline at end of file