Skip to content
Snippets Groups Projects
Commit 987ac993 authored by ko_oler's avatar ko_oler
Browse files

fix .gitlab-ci.yml

parent 40aea828
No related branches found
No related tags found
1 merge request!1Добавлена генерация файлов для frontend в Makefile и публикацию npm-пакета
Pipeline #19089 failed with stage
in 15 seconds
......@@ -15,7 +15,7 @@ publish_npm:
changes:
- config/package.json
script:
- npm install ts-proto@1.115.5
- npm install -g ts-proto@1.115.5
- npm install -g typescript@4.7.4
- make proto
- cd ./config
......
.PHONY: proto-js .FORCE
SHELL = /bin/bash -o pipefail
PROTODIR=perxis-proto/proto
DSTDIR=config/dist
PROTODIR=./perxis-proto/proto
DSTDIR=./config/dist
ALLPROTO?=$(shell find $(PROTODIR) -name '*.proto' )
PROTOFILES= $(filter-out proto/status/status.proto, $(ALLPROTO))
......@@ -22,7 +22,7 @@ proto-js: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js
%.ts: %.proto
@protoc -I=$(PROTODIR) \
--plugin=./node_modules/.bin/protoc-gen-ts_proto \
--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 \
--ts_proto_out=$(DSTDIR) \
"$<"
......@@ -55,11 +55,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\" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment