Skip to content

Commit c06ad01

Browse files
authored
Merge pull request #7 from kobi97/improve/use_php_mysql_replication_6.2
upgrade php-mysql-replication v6.2.2
2 parents 859f015 + a24ca6f commit c06ad01

File tree

12 files changed

+1087
-308
lines changed

12 files changed

+1087
-308
lines changed

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
language: php
22

33
php:
4-
- '7.1'
4+
- '7.3'
55

66
env:
77
- DB=mariadb-10.0
88
- DB=mariadb-10.1
9+
- DB=mariadb-10.2
10+
- DB=mariadb-10.3
911
services:
1012
- docker
1113

@@ -22,7 +24,9 @@ before_script:
2224
- "if [ $DB = 'mariadb-10.1' ]; then docker build -t db-slave -f ./demo/Resources/docker/db-slave/Dockerfile-10.1 ./demo/Resources/docker/db-slave; fi"
2325
- "if [ $DB = 'mariadb-10.2' ]; then docker build -t db-master -f ./demo/Resources/docker/db-master/Dockerfile-10.2 ./demo/Resources/docker/db-master; fi"
2426
- "if [ $DB = 'mariadb-10.2' ]; then docker build -t db-slave -f ./demo/Resources/docker/db-slave/Dockerfile-10.2 ./demo/Resources/docker/db-slave; fi"
25-
- docker run -p 13306:3306 --name db-master -e MYSQL_ROOT_PASSWORD=1234 -d db-master
27+
- "if [ $DB = 'mariadb-10.3' ]; then docker build -t db-master -f ./demo/Resources/docker/db-master/Dockerfile-10.3 ./demo/Resources/docker/db-master; fi"
28+
- "if [ $DB = 'mariadb-10.3' ]; then docker build -t db-slave -f ./demo/Resources/docker/db-slave/Dockerfile-10.3 ./demo/Resources/docker/db-slave; fi"
29+
- docker run -p 13306:3306 --name db-master -e MYSQL_ROOT_PASSWORD=1234 -d db-master
2630
- docker run -p 13307:3306 --name db-slave --link db-master:master -e MYSQL_ROOT_PASSWORD=1234 -d db-slave
2731
- sleep 60;
2832
- docker exec -it db-master bash -c "mysql -uroot -p1234 < temp/my.master.sql"
@@ -39,6 +43,7 @@ script:
3943
- "if [ $DB = 'mariadb-10.0' ]; then php ./demo/cron/[every]binlog_collect_partitioner.php change_pos mariadb-bin.000004 4; fi"
4044
- "if [ $DB = 'mariadb-10.1' ]; then php ./demo/cron/[every]binlog_collect_partitioner.php change_pos mariadb-bin.000005 4; fi"
4145
- "if [ $DB = 'mariadb-10.2' ]; then php ./demo/cron/[every]binlog_collect_partitioner.php change_pos mariadb-bin.000003 4; fi"
46+
- "if [ $DB = 'mariadb-10.3' ]; then php ./demo/cron/[every]binlog_collect_partitioner.php change_pos mariadb-bin.000003 4; fi"
4247
- php ./demo/cron/\[every\]binlog_collect_partitioner.php continue
4348
- php ./demo/cron/\[every\]binlog_collect_worker.php
4449
- php ./demo/cron/\[every\]binlog_collect_worker.php

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
### CHANGED
8+
- upgrade php-mysql-replication v6.2.2
9+
- fixed Dto/TimeMonitorDto.php
10+
11+
### Added
12+
- add test env=mariadb-10.2, 10.3
13+
714
## [1.3.0] - 2019-09-18
815
### CHANGED
916
- change env variable

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"illuminate/support": "^5.4",
14-
"krowinski/php-mysql-replication": "6.0.1",
14+
"krowinski/php-mysql-replication": "6.2.2",
1515
"monolog/monolog": "^1.18.0",
1616
"ridibooks/platform-gnfdb": "^0.1",
1717
"vlucas/phpdotenv": "^2.4",

0 commit comments

Comments
 (0)