From 218587ba7292e6b9b2b278002e843a5bde13e281 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Thu, 15 Dec 2022 16:20:07 +0800
Subject: [PATCH] fix .gitlab-ci.yml
---
.gitlab-ci.yml | 3 ++-
Makefile | 28 ++++++++++++++--------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8160fa8..bfa3338 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
- publish-npm
publish_npm:
- image: "node:current-alpine3.17"
+ image: "node:current-alpine"
stage: publish-npm
before_script:
- apk add --update bash
@@ -11,6 +11,7 @@ publish_npm:
- apk add --update jq
- apk add --update rsync
- apk add --update protobuf-dev
+ - apk add --update protobuf-dev
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes:
diff --git a/Makefile b/Makefile
index d1e1bd4..5ce9809 100644
--- a/Makefile
+++ b/Makefile
@@ -58,17 +58,17 @@ ifeq (,$(shell which protoc-gen-ts_proto))
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\" \
- or visit \"https://github.com/microsoft/TypeScript\" for more.\n")
-endif
-ifneq ($(shell expr $(TSC_MAJOR_VERSION) \>= 4), 1)
- $(error "Current version is outdated. Please update typescript \n")
-endif
-ifneq ($(shell expr $(TSC_MINOR_VERSION) \>= 7), 1)
- $(error "Current version is lower than 4.7 Please update typescript \n")
-endif
-ifneq ($(shell expr $(TSC_MIC_VERSION) \>= 4), 1)
- $(error "Current version is lower than 4.7.4 Please update typescript \n")
-endif
\ No newline at end of file
+#ifeq (,$(shell which tsc))
+# $(error "Typescript not found. \
+# Run \"npm install -g typescript@4.7.4\" \
+# or visit \"https://github.com/microsoft/TypeScript\" for more.\n")
+#endif
+#ifneq ($(shell expr $(TSC_MAJOR_VERSION) \>= 4), 1)
+# $(error "Current version is outdated. Please update typescript \n")
+#endif
+#ifneq ($(shell expr $(TSC_MINOR_VERSION) \>= 7), 1)
+# $(error "Current version is lower than 4.7 Please update typescript \n")
+#endif
+#ifneq ($(shell expr $(TSC_MIC_VERSION) \>= 4), 1)
+# $(error "Current version is lower than 4.7.4 Please update typescript \n")
+#endif
\ No newline at end of file
--
GitLab