diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59b6fc8adf434beb133fdacb95f36e8c2a0d0a46..15c7e4f38d41f74433a2ccf13900a39ee463944f 100644 --- a/.gitlab-ci.yml +++ b/.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" diff --git a/Makefile b/Makefile index c14d429b802719349256c51e1dc9247e971b47d7..e4ff372d35a43a39b10e933523704606a0f9028f 100644 --- a/Makefile +++ b/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 \ diff --git a/config/generate.sh b/config/generate.sh index bcf7e7624575ebf15f15cc5cef5689fd016881e2..95ea8dc8719a1e88ab8d91403f6ce282db776115 100755 --- a/config/generate.sh +++ b/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