diff --git a/gitlab-ci-1.2.yml b/gitlab-ci-1.2.yml index 2bed4e1c88699d5a590f5dcefdce0f96d2ad4429..ce3663635cc58e60869db1bd419d275e299f31ba 100644 --- a/gitlab-ci-1.2.yml +++ b/gitlab-ci-1.2.yml @@ -26,7 +26,7 @@ stages: include: - project: 'wpdesk/gitlab-ci' - ref: 'master' + ref: 'feature/mysql-bin-logs' file: - '/includes/prepare.yml' - '/includes/translations.yml' diff --git a/gitlab-ci-free.yml b/gitlab-ci-free.yml index db249dc97e6215eb2c7ecbaf640a251707662a3c..2ea5b30089de65f7e547ff794ab285a23baed71c 100644 --- a/gitlab-ci-free.yml +++ b/gitlab-ci-free.yml @@ -1,6 +1,6 @@ include: - project: 'wpdesk/gitlab-ci' - ref: 'master' + ref: 'feature/mysql-bin-logs' file: '/gitlab-ci-1.2.yml' deploy to repository: @@ -22,4 +22,3 @@ update wpdesk plugins database: upload translations to repo: when: delayed start_in: 30 minutes - diff --git a/includes/tests/codeception-parallel.yml b/includes/tests/codeception-parallel.yml index 37317489caba3d1019bd8b0897981724ea00f0ae..c99da7801a93943122aa6190a973061c076ae8ca 100644 --- a/includes/tests/codeception-parallel.yml +++ b/includes/tests/codeception-parallel.yml @@ -24,7 +24,7 @@ prepare codeception parallel: services: - name: mysql:5.6 alias: mysqltests - command: [--max-allowed-packet=67108864] + command: [--max-allowed-packet=67108864,--skip-log-bin] - name: wpdesknet/wordpress:52 alias: wootests artifacts: @@ -89,7 +89,7 @@ prepare codeception parallel: services: - name: mysql:5.6 alias: mysqltests - command: [--max-allowed-packet=67108864] + command: [--max-allowed-packet=67108864,--skip-log-bin] - name: wpdesknet/wordpress:52 alias: wootests - name: selenium/standalone-chrome:latest @@ -158,6 +158,7 @@ prepare codeception parallel: services: - name: mysql:5.6 alias: mysqltests + command: [--max-allowed-packet=67108864,--skip-log-bin] - name: wpdesknet/wordpress:52 alias: wootests - name: selenium/standalone-chrome:latest @@ -204,4 +205,3 @@ codeception code coverage manual: <<: *job-codeception-coverage when: manual allow_failure: true -