From 92f6372733653c32fcda6513bbe9a4d2baad47cc Mon Sep 17 00:00:00 2001 From: ko_oler <kooler89@gmail.com> Date: Fri, 30 Dec 2022 11:50:22 +0800 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D0=9F=D0=A0:=20-=20=D0=B7=D0=B0=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D1=8F=20node=20=D0=B2=20=D0=BE=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=B7=D0=B5=20-=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20proto-clean=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=87?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BA=D0=B8=20=D1=81=D0=B3=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=BC=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- Makefile | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3acf021..e02831c 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 5ded419..be5625c 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-файлов -- GitLab