Commit f902080d authored by Илья Рассадин's avatar Илья Рассадин
Browse files

Merge branch 'ir-ce-deploy-js' into 'master' 

Use npm run $JS_NPM_SCRIPT directly in .lint_js, default to 'lint'

See merge request boilerplate/ci!12
parents 9e0ac9ee cf6221c4

gitlab-ci-template.yml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ include: 
#   extends: .lint_js

#   variables:

#     JS_RESOURCES_ROOT: resources-terminal

#     JS_NPM_SCRIPT: prod-terminal

#     JS_NPM_SCRIPT: lint:terminal

#   rules:

#     - if: $CI_COMMIT_REF_PROTECTED == 'true' || $CI_PIPELINE_SOURCE == "merge_request_event"

#       changes:

test.yml

+2 −2
Original line number Diff line number Diff line 
.lint_js:

  variables:

    JS_RESOURCES_ROOT: resources

    JS_NPM_SCRIPT: prod

    JS_NPM_SCRIPT: lint

  stage: test

  script:

    - cd $CI_PROJECT_DIR && npm install && npm run lint-$JS_NPM_SCRIPT $JS_RESOURCES_ROOT/js/**

    - cd $CI_PROJECT_DIR && npm install && npm run $JS_NPM_SCRIPT $JS_RESOURCES_ROOT/js/**

  rules:

    - if: $CI_COMMIT_REF_PROTECTED == 'true' || $CI_PIPELINE_SOURCE == "merge_request_event"

      changes: