From 1c723dd5a64c8a8d4c51c8935c36fb8b8ce673a7 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Thu, 15 Dec 2022 16:22:33 +0800
Subject: [PATCH] fix .gitlab-ci.yml
---
.gitlab-ci.yml | 1 +
Makefile | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfa3338..710bef8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ publish_npm:
- config/package.json
script:
- mkdir clients
+ - npm install ts-proto@1.115.5
- make proto
- cd ./config
- rsync -a --prune-empty-dirs ../clients ./
diff --git a/Makefile b/Makefile
index 5ce9809..5de7249 100644
--- a/Makefile
+++ b/Makefile
@@ -53,11 +53,11 @@ ifeq (,$(shell which npm))
$(error "NPM not found. Run for linux: \"sudo apt install npm\", for mac: \"brew install npm\" \
or visit \"https://docs.npmjs.com/getting-started\" for more.\n")
endif
-ifeq (,$(shell which protoc-gen-ts_proto))
- $(error "Ts-proto plugin for protoc not found. \
- Run \"npm install -g ts-proto@1.115.5\" \
- or visit \"https://github.com/stephenh/ts-proto\" for more.\n")
-endif
+#ifeq (,$(shell which protoc-gen-ts_proto))
+# $(error "Ts-proto plugin for protoc not found. \
+# Run \"npm install -g ts-proto@1.115.5\" \
+# or visit \"https://github.com/stephenh/ts-proto\" for more.\n")
+#endif
#ifeq (,$(shell which tsc))
# $(error "Typescript not found. \
# Run \"npm install -g typescript@4.7.4\" \
--
GitLab