@@ -113,10 +113,6 @@ jobs:
113113 db : " mysql:5.7"
114114 db_alias : " MyISAM Tests"
115115 MYISAM : 1
116- - php : ' 8.1'
117- db : " mysql:8.0"
118- COVERAGE : 1
119- db_alias : " mysql:8.0 with Coverage"
120116 - php : ' 8.1'
121117 db : " mysql:8.1"
122118 - php : ' 8.2'
@@ -179,21 +175,12 @@ jobs:
179175 echo "db=$db" >> $GITHUB_OUTPUT
180176
181177 - name : Setup PHP
182- if : ${{ matrix.COVERAGE != 1 }}
183178 uses : shivammathur/setup-php@v2
184179 with :
185180 php-version : ${{ matrix.php }}
186181 extensions : dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, mysqli, pdo, pdo_mysql, ldap
187182 coverage : none
188183
189- - name : Setup PHP with Coverage
190- if : ${{ matrix.COVERAGE == 1 }}
191- uses : shivammathur/setup-php@v2
192- with :
193- php-version : ${{ matrix.php }}
194- extensions : dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
195- coverage : xdebug
196-
197184 - name : Setup environment for phpBB
198185 env :
199186 DB : ${{steps.database-type.outputs.db}}
@@ -210,36 +197,14 @@ jobs:
210197 working-directory : ./phpBB3
211198
212199 - name : Setup PHPUnit files
213- env :
214- DB : ${{steps.database-type.outputs.db}}
215- COVERAGE : ${{ matrix.COVERAGE != 1 && '0' || '1' }}
216- run : |
217- if [ $COVERAGE == '1' ]
218- then
219- sed -n '1h;1!H;${;g;s/<\/php>/<\/php>\n\t<filter>\n\t\t<whitelist>\n\t\t\t<directory>..\/<\/directory>\n\t\t\t<exclude>\n\t\t\t\t<directory>..\/tests\/<\/directory>\n\t\t\t\t<directory>..\/language\/<\/directory>\n\t\t\t\t<directory>..\/migrations\/<\/directory>\n\t\t\t<\/exclude>\n\t\t<\/whitelist>\n\t<\/filter>/g;p;}' .github/phpunit-$DB-github.xml &> phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml
220- else
221- mkdir -p phpBB/ext/$EXTNAME/.github && cp .github/phpunit* $_
222- fi
200+ run : mkdir -p phpBB/ext/$EXTNAME/.github && cp .github/phpunit* $_
223201 working-directory : ./phpBB3
224202
225203 - name : Run unit tests
226204 env :
227205 DB : ${{steps.database-type.outputs.db}}
228- COVERAGE : ${{ matrix.COVERAGE != 1 && '0' || '1' }}
229- run : |
230- if [ $COVERAGE == '1' ]
231- then
232- phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php --coverage-clover build/logs/clover.xml
233- else
234- phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php
235- fi
206+ run : phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php
236207 working-directory : ./phpBB3
237-
238- - name : Send code coverage
239- if : ${{ matrix.COVERAGE == 1 }}
240- uses : codecov/codecov-action@v3
241- with :
242- files : ./phpBB3/build/logs/clover.xml
243208 # END MySQL and MariaDB Job
244209
245210 # START PostgreSQL Job
0 commit comments