Skip to content
Snippets Groups Projects
Commit 2bf2594b authored by ko_oler's avatar ko_oler
Browse files

правки по ПР

parent 907f43af
No related branches found
No related tags found
1 merge request!1Добавлена генерация файлов для frontend в Makefile и публикацию npm-пакета
Pipeline #19370 passed with stage
Stage:
    in 40 seconds
    Hide whitespace changes
    Inline Side-by-side
    .gitlab-ci.yml
    + 6
    − 9
    View file @ 2bf2594b
    stages: stages:
    - publish-npm - deploy
    publish_npm: publish_npm:
    image: "node:current-alpine" image: "node:current-alpine"
    stage: publish-npm stage: deploy
    variables: variables:
    GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
    before_script: before_script:
    - apk add --update bash - apk add --update make bash protobuf-dev yarn
    - apk add --update make - npm install -g ts-proto@1.115.5
    - apk add --update protobuf-dev - npm install -g typescript@4.7.4
    - apk add --update yarn
    rules: rules:
    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
    changes: changes:
    - config/package.json - config/package.json
    script: script:
    - npm install -g ts-proto@1.115.5
    - npm install -g typescript@4.7.4
    - mkdir config/dist - mkdir config/dist
    - make proto - make proto
    - cd ./config - cd ./config
    ......
    Makefile
    + 2
    − 4
    View file @ 2bf2594b
    ...@@ -14,10 +14,8 @@ TSC_MAJOR_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f1) ...@@ -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_MINOR_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f2)
    TSC_MIC_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f3) TSC_MIC_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f3)
    # Генерация js # Генерация
    proto: proto-js proto: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js
    proto-js: protoc-check js-check $(PROTOTSFILES) generate-ts generate-js
    @echo "Generated all protobuf JavaScrypt files" @echo "Generated all protobuf JavaScrypt files"
    %.ts: %.proto %.ts: %.proto
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment