File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -60,13 +60,13 @@ jobs:
60
60
61
61
# https://docs.github.com/en/free-pro-team@latest/actions/guides/about-service-containers
62
62
services :
63
- mysql :
63
+ database :
64
64
image : ${{ matrix.db-image }}
65
65
env :
66
66
MYSQL_ROOT_PASSWORD : root
67
67
ports :
68
68
- 3306:3306
69
- options : -- health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
69
+ options : ${{ startsWith(matrix.db-image, 'mariadb') && '-- health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=1s --health-timeout=10s --health-retries=60' || '--health-cmd=" mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3' }}
70
70
71
71
steps :
72
72
- uses : actions/checkout@v3
Original file line number Diff line number Diff line change 9
9
concurrency :
10
10
group : tests-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
11
11
cancel-in-progress : true
12
-
12
+
13
13
jobs :
14
14
15
15
phpunit :
@@ -97,13 +97,13 @@ jobs:
97
97
98
98
# https://docs.github.com/en/free-pro-team@latest/actions/guides/about-service-containers
99
99
services :
100
- mysql :
100
+ database :
101
101
image : ${{ matrix.db-image }}
102
102
env :
103
103
MYSQL_ROOT_PASSWORD : root
104
104
ports :
105
105
- 3306:3306
106
- options : -- health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
106
+ options : ${{ startsWith(matrix.db-image, 'mariadb') && '-- health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=1s --health-timeout=10s --health-retries=60' || '--health-cmd=" mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3' }}
107
107
108
108
steps :
109
109
- uses : actions/checkout@v3
You can’t perform that action at this time.
0 commit comments