diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3acf021e46f128b5660b46ced822366b37bfe644..e02831c4da8aacd477107919e4f6f30aa6a4601c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - deploy publish_npm: - image: "node:current-alpine3.17" + image: "node:19.3-alpine3.17" stage: deploy variables: GIT_SUBMODULE_STRATEGY: recursive diff --git a/Makefile b/Makefile index 5ded41975ee2ba85c36077c97af9bf92c3fdab40..be5625c1b6124b1e2506fa7a7beb01514103c722 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ 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 - @echo "Generated all protobuf JavaScrypt files" +proto: protoc-check js-check $(PROTOTSFILES) generate-js + @echo "Generated all files for npm package" %.ts: %.proto @protoc -I=$(PROTODIR) \ @@ -27,14 +27,12 @@ proto: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js --ts_proto_out=$(DSTDIR) \ "$<" -generate-ts: - @echo "Generated all TypeScript files" generate-js: @./config/generate.sh proto-clean: - @rm -f $(PROTOTSFILES) + @rm -rf $(DSTDIR) .FORCE: # Проверка, что установлены необходимые инструменты для генерации proto-файлов