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

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

Remove JS_RESOURCES_ROOT, use file-extension globs in changes

See merge request boilerplate/ci!14
parents 6011b967 1d635365

.build_composer.yml

+3 −2
Original line number Diff line number Diff line
@@ -85,8 +85,9 @@ 
    - if: $CI_COMMIT_REF_PROTECTED == 'true'

      changes:

        - !reference [.default_changes, js_changes]

        - resources/js/**/*

        - resources/sass/**/*

        - "**/*.ts"

        - "**/*.vue"

        - "**/*.scss"



.build_composer_dev:

  stage: prebuild

.deploy_code_to_server.yml

+3 −2
Original line number Diff line number Diff line
@@ -95,8 +95,9 @@ 
    - if: $CI_COMMIT_REF_PROTECTED == 'true'

      changes:

        - !reference [.default_changes, js_changes]

        - resources/js/**/*

        - resources/sass/**/*

        - "**/*.ts"

        - "**/*.vue"

        - "**/*.scss"



deploy_autotests_to_server:

  extends: .before_deploy_code

gitlab-ci-template.yml

+1 −19
Original line number Diff line number Diff line
@@ -38,18 +38,12 @@ include: 
#     - setup_environment_vars

#     - build_js



# --- JS with non-standard paths (example: resources-terminal → terminal/build) ---

# --- JS with non-default npm scripts (example: separate terminal subproject) ---



# lint_js:

#   extends: .lint_js

#   variables:

#     JS_RESOURCES_ROOT: resources-terminal

#     JS_NPM_SCRIPT: lint:terminal

#   rules:

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

#       changes:

#         - !reference [.default_changes, js_changes]

#         - resources-terminal/js/**/*



# build_js:

#   extends: .build_js
@@ -58,12 +52,6 @@ include: 
#     JS_NPM_SCRIPT: prod-terminal

#   dependencies:

#     - setup_environment_vars

#   rules:

#     - if: $CI_COMMIT_REF_PROTECTED == 'true'

#       changes:

#         - !reference [.default_changes, js_changes]

#         - resources-terminal/js/**/*

#         - resources-terminal/sass/**/*



# deploy_js_files_to_server:

#   extends: .deploy_js_files_to_server
@@ -72,9 +60,3 @@ include: 
#   dependencies:

#     - setup_environment_vars

#     - build_js
 
#   rules:

#     - if: $CI_COMMIT_REF_PROTECTED == 'true'

#       changes:

#         - !reference [.default_changes, js_changes]

#         - resources-terminal/js/**/*

#         - resources-terminal/sass/**/*

test.yml

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

  variables:

    JS_RESOURCES_ROOT: resources

    JS_NPM_SCRIPT: lint

  stage: test

  script:

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

    - cd $CI_PROJECT_DIR && npm install && npm run $JS_NPM_SCRIPT

  rules:

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

      changes:

        - !reference [.default_changes, js_changes]

        - resources/js/**/*

        - "**/*.ts"

        - "**/*.vue"



.phpunit:

  stage: test