@@ -129,66 +129,12 @@ jobs:
129129 # Required by old repository tests
130130 DATABASE : " pgsql://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/testdb"
131131
132- integration-tests-mysql-80 :
133- name : MySQL integration tests (8.0)
132+ integration-tests-mysql :
133+ name : MySQL integration tests
134134 needs : tests
135135 services :
136136 mysql :
137- image : mysql:8.0
138- ports :
139- - 3306/tcp
140- env :
141- MYSQL_RANDOM_ROOT_PASSWORD : true
142- MYSQL_USER : mysql
143- MYSQL_PASSWORD : mysql
144- MYSQL_DATABASE : testdb
145- options : >-
146- --health-cmd="mysqladmin ping"
147- --health-interval=10s
148- --health-timeout=5s
149- --health-retries=5
150- --tmpfs=/var/lib/mysql
151- runs-on : " ubuntu-24.04"
152- timeout-minutes : 60
153-
154- strategy :
155- fail-fast : false
156- matrix :
157- php :
158- - ' 7.4'
159- - ' 8.0'
160- - ' 8.1'
161-
162- steps :
163- - uses : actions/checkout@v5
164-
165- - name : Setup PHP Action
166- uses : shivammathur/setup-php@v2
167- with :
168- php-version : ${{ matrix.php }}
169- coverage : none
170- extensions : pdo_mysql, gd, redis
171- tools : cs2pr
172-
173- - uses : ramsey/composer-install@v3
174- with :
175- dependency-versions : " highest"
176-
177- - name : Setup problem matchers for PHPUnit
178- run : echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
179-
180- - name : Run integration test suite vs MySQL
181- run : composer run-script integration
182- env :
183- DATABASE_URL : " mysql://mysql:mysql@127.0.0.1:${{ job.services.mysql.ports[3306] }}/testdb"
184- DATABASE : " mysql://mysql:mysql@127.0.0.1:${{ job.services.mysql.ports[3306] }}/testdb"
185-
186- integration-tests-mysql-84 :
187- name : MySQL integration tests (8.4)
188- needs : tests
189- services :
190- mysql :
191- image : mysql:8.4
137+ image : ${{ matrix.image }}
192138 ports :
193139 - 3306/tcp
194140 env :
@@ -212,6 +158,9 @@ jobs:
212158 - ' 7.4'
213159 - ' 8.0'
214160 - ' 8.1'
161+ image :
162+ - ' mysql:8.0'
163+ - ' mysql:8.4'
215164
216165 steps :
217166 - uses : actions/checkout@v5
0 commit comments