diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f3a67a..dd236cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,3 +11,4 @@ variables: include: - ci/develop.yml + - "ci/rules.yml" diff --git a/ci/develop.yml b/ci/develop.yml index ae2bdea..195b934 100644 --- a/ci/develop.yml +++ b/ci/develop.yml @@ -8,7 +8,7 @@ develop:npm: paths: - node_modules/ rules: - - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "feature/ci" + - !reference [.build-npm-rules, rules] variables: PRODUCT: "$PRODUCT_PROD" script: @@ -28,7 +28,7 @@ develop-image: image: harbor.vimpelcom.ru/dockerhub/library/docker:20.10.11-dind stage: package rules: - - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "feature/ci" + - !reference [.build-npm-rules, rules] before_script: - cat /certs/ca.crt >> /etc/ssl/certs/ca-certificates.crt - echo PRODUCT="$PRODUCT" >> .env diff --git a/ci/rules.yml b/ci/rules.yml new file mode 100644 index 0000000..9849945 --- /dev/null +++ b/ci/rules.yml @@ -0,0 +1,8 @@ +.build-npm-rules: + rules: + - if: $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "merge_request_event" + when: never + - if: $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "feature/ci") + exists: + - .npmrc + - ./*/.npmrc