diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15c96d6935482c85f6433ac0812c573d86c0977a..14395793d107ea402b9f9438acef5a9fd84436d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,24 +1,21 @@ stages: - - publish-npm + - deploy publish_npm: image: "node:current-alpine" - stage: publish-npm + stage: deploy variables: GIT_SUBMODULE_STRATEGY: recursive before_script: - - apk add --update bash - - apk add --update make - - apk add --update protobuf-dev - - apk add --update yarn + - apk add --update make bash protobuf-dev yarn + - npm install -g ts-proto@1.115.5 + - npm install -g typescript@4.7.4 rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - config/package.json script: - - npm install -g ts-proto@1.115.5 - - npm install -g typescript@4.7.4 - mkdir config/dist - make proto - cd ./config diff --git a/Makefile b/Makefile index 61b6322d639a6b44fc773bc500a3f97870261747..c32db0ebca3a61ebe07af897665454fc8c220ebf 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,8 @@ TSC_MAJOR_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f1) TSC_MINOR_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f2) TSC_MIC_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f3) -# Генерация js -proto: proto-js - -proto-js: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js +# Генерация +proto: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js @echo "Generated all protobuf JavaScrypt files" %.ts: %.proto