From fc6ae393240260a3984e3ef30b07ae4549425790 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Thu, 15 Dec 2022 17:30:13 +0800
Subject: [PATCH] fix .gitlab-ci.yml

---
 Makefile             | 4 ++--
 config/tsconfig.json | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index fb5bcd4..c14d429 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ DSTDIR=config/clients
 ALLPROTO?=$(shell find $(PROTODIR) -name '*.proto' )
 PROTOFILES=	$(filter-out proto/status/status.proto, $(ALLPROTO))
 PROTOTSFILES=$(ALLPROTO:.proto=.ts)
-PROTOJSFILES=$(PROTOFILES:.proto=_pb.js)
 
 PROTOC_MAJOR_VERSION=$(shell protoc --version | awk '{print $$2;}' | cut -d. -f1)
 PROTOC_MINOR_VERSION=$(shell protoc --version | awk '{print $$2;}' | cut -d. -f2)
@@ -22,6 +21,7 @@ proto-js: protoc-check js-check generate-js $(PROTOTSFILES)
 	@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 \
@@ -32,7 +32,7 @@ generate-js:
 	@./config/generate.sh
 
 proto-clean:
-	@rm -f $(PROTOTSFILES) -f $(PROTOJSFILES)
+	@rm -f $(PROTOTSFILES)
 
 .FORCE:
 # Проверка, что установлены необходимые инструменты для генерации proto-файлов
diff --git a/config/tsconfig.json b/config/tsconfig.json
index cc5b5e6..682cc98 100644
--- a/config/tsconfig.json
+++ b/config/tsconfig.json
@@ -98,5 +98,6 @@
         // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
         "skipLibCheck": true /* Skip type checking all .d.ts files. */
     },
-    "include": ["./clients"],
+    "include": ["../clients/**/*"],
+    "exclude": ["../config/**/*"]
 }
-- 
GitLab