Skip to content
Snippets Groups Projects
Commit 218587ba authored by ko_oler's avatar ko_oler
Browse files

fix .gitlab-ci.yml

parent 08e2f231
No related branches found
No related tags found
1 merge request!1Добавлена генерация файлов для frontend в Makefile и публикацию npm-пакета
Pipeline #19064 failed with stage
in 11 seconds
...@@ -2,7 +2,7 @@ stages: ...@@ -2,7 +2,7 @@ stages:
- publish-npm - publish-npm
publish_npm: publish_npm:
image: "node:current-alpine3.17" image: "node:current-alpine"
stage: publish-npm stage: publish-npm
before_script: before_script:
- apk add --update bash - apk add --update bash
...@@ -11,6 +11,7 @@ publish_npm: ...@@ -11,6 +11,7 @@ publish_npm:
- apk add --update jq - apk add --update jq
- apk add --update rsync - apk add --update rsync
- apk add --update protobuf-dev - apk add --update protobuf-dev
- apk add --update protobuf-dev
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes: changes:
......
...@@ -58,17 +58,17 @@ ifeq (,$(shell which protoc-gen-ts_proto)) ...@@ -58,17 +58,17 @@ ifeq (,$(shell which protoc-gen-ts_proto))
Run \"npm install -g ts-proto@1.115.5\" \ Run \"npm install -g ts-proto@1.115.5\" \
or visit \"https://github.com/stephenh/ts-proto\" for more.\n") or visit \"https://github.com/stephenh/ts-proto\" for more.\n")
endif endif
ifeq (,$(shell which tsc)) #ifeq (,$(shell which tsc))
$(error "Typescript not found. \ # $(error "Typescript not found. \
Run \"npm install -g typescript@4.7.4\" \ # Run \"npm install -g typescript@4.7.4\" \
or visit \"https://github.com/microsoft/TypeScript\" for more.\n") # or visit \"https://github.com/microsoft/TypeScript\" for more.\n")
endif #endif
ifneq ($(shell expr $(TSC_MAJOR_VERSION) \>= 4), 1) #ifneq ($(shell expr $(TSC_MAJOR_VERSION) \>= 4), 1)
$(error "Current version is outdated. Please update typescript \n") # $(error "Current version is outdated. Please update typescript \n")
endif #endif
ifneq ($(shell expr $(TSC_MINOR_VERSION) \>= 7), 1) #ifneq ($(shell expr $(TSC_MINOR_VERSION) \>= 7), 1)
$(error "Current version is lower than 4.7 Please update typescript \n") # $(error "Current version is lower than 4.7 Please update typescript \n")
endif #endif
ifneq ($(shell expr $(TSC_MIC_VERSION) \>= 4), 1) #ifneq ($(shell expr $(TSC_MIC_VERSION) \>= 4), 1)
$(error "Current version is lower than 4.7.4 Please update typescript \n") # $(error "Current version is lower than 4.7.4 Please update typescript \n")
endif #endif
\ No newline at end of file \ No newline at end of file
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