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

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

Make JS_RESOURCES_ROOT a direct reference for the linted files

See merge request boilerplate/ci!13
parents f902080d b6885b94

.build_composer.yml

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 
.build_js:

  stage: build

  variables:

    JS_RESOURCES_ROOT: resources

    JS_BUILD_OUTPUT: new/build

    JS_NPM_SCRIPT: prod

  script:

gitlab-ci-template.yml

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ include: 
# build_js:

#   extends: .build_js

#   variables:

#     JS_RESOURCES_ROOT: resources-terminal

#     JS_BUILD_OUTPUT: terminal/build

#     JS_NPM_SCRIPT: prod-terminal

#   dependencies:

test.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    JS_NPM_SCRIPT: lint

  stage: test

  script:

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

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

  rules:

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

      changes: