Fix CI (#201)

* fix: 🐛 tsconfig * fix: 🐛 google api proto path * fix: 🐛 version condition * fix: 🐛 version condition
wechaty · Jul 27, 2023 · f1ecd6c · f1ecd6c
1 parent 1099c01
commit f1ecd6c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/...c-gen-openapiv2/options/annotations.proto → ...y.Grpc/proto/google/api/annotations.proto b/...c-gen-openapiv2/options/annotations.proto → ...y.Grpc/proto/google/api/annotations.proto
diff --git a/...toc-gen-openapiv2/options/openapiv2.proto → ...aty.Grpc/proto/google/api/openapiv2.proto b/...toc-gen-openapiv2/options/openapiv2.proto → ...aty.Grpc/proto/google/api/openapiv2.proto
diff --git a/scripts/install-protoc.sh b/scripts/install-protoc.sh
@@ -32,14 +32,10 @@ function check_protoc_version () {
   majorVer=$(echo $protocVersion | cut -d. -f 1)
   minorVer=$(echo $protocVersion | cut -d. -f 2)
 
-  (($majorVer == 3)) || {
-    echo "protoc major version must >= 3 (the installed version is $protocVersion)"
-    exit 1
-  }
-
   # https://github.com/wechaty/grpc/issues/109
-  (($minorVer >= 17)) || {
-    echo "protoc minor version must >= 17 (the installed version is $protocVersion)"
+
+  ((($majorVer == 3 && $minorVer >= 17) || $majorVer > 3)) || {
+    echo "protoc version must >= 3.17 (the installed version is $protocVersion)"
     exit 1
   }
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -2,6 +2,9 @@
   "extends": "@chatie/tsconfig",
   "compilerOptions": {
     "outDir": "dist/esm",
+    "verbatimModuleSyntax": false,
+    // See: https://github.com/wechaty/wechaty/issues/2551
+    "ignoreDeprecations": "5.0"
   },
   "exclude": [
     "node_modules/",