Commit dc7ec104 authored by Ilya Rassadin's avatar Ilya Rassadin
Browse files

fix changes list for js CI/CD jobs

parent 3fa370b5

.build_composer.yml

+2 −3
Original line number Diff line number Diff line
@@ -82,11 +82,10 @@ 
      - "$JS_BUILD_OUTPUT/"

    expire_in: 1 week

  rules:

    - if: $CI_COMMIT_REF_PROTECTED == 'true'

      changes: !reference [.default_changes, js_changes]

    - if: $CI_COMMIT_REF_PROTECTED == 'true'

      changes:

        - !reference [.default_changes, js_changes]

        - "**/*.ts"

        - "**/*.vue"

        - "**/*.scss"



.build_composer_dev:

.deploy_code_to_server.yml

+2 −3
Original line number Diff line number Diff line
@@ -92,11 +92,10 @@ 
      rsync $RSYNC_ADMIN_PARAMS $RSYNC_PARAMS -e "ssh $SSH_OPTS" \

        $CI_PROJECT_DIR/$JS_BUILD_OUTPUT/ $DEPLOY_HOST_PATH/$JS_BUILD_OUTPUT/

  rules:

    - if: $CI_COMMIT_REF_PROTECTED == 'true'

      changes: !reference [.default_changes, js_changes]

    - if: $CI_COMMIT_REF_PROTECTED == 'true'

      changes:

        - !reference [.default_changes, js_changes]

        - "**/*.ts"

        - "**/*.vue"

        - "**/*.scss"



deploy_autotests_to_server:

before_script.yml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ before_script: 
    - package-lock.json

    - webpack.config.js

    - webpack.mix.js

    - "**/*.ts"

    - "**/*.vue"



.set_layouts: &set_layouts |

  cd $CI_PROJECT_DIR/working/ && export LAYOUTS=(`ls -1 -d ./*/|perl -nE 's{^\./(.+)/$}{$1}; print if /^[^.]/'`)

test.yml

+1 −4
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ 
    - 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]

        - "**/*.ts"

        - "**/*.vue"

      changes: !reference [.default_changes, js_changes]



.phpunit:

  stage: test