Skip to content

Commit 7c3c786

Browse files
committed
Update tests for master branch testing
1 parent ce9add2 commit 7c3c786

1 file changed

Lines changed: 21 additions & 15 deletions

File tree

.github/workflows/tests.yml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ on:
5656
PRIMARY_PHP_VERSION:
5757
required: false
5858
type: string
59-
default: '7.2'
59+
default: '8.1'
6060
PHP_VERSION_MATRIX:
6161
required: false
6262
type: string
63-
default: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
63+
default: '["8.1", "8.2", "8.3", "8.4"]'
6464
secrets:
6565
CODECOV_TOKEN:
6666
required: false
@@ -151,28 +151,30 @@ jobs:
151151
strategy:
152152
matrix:
153153
php: ${{ fromJSON(inputs.PHP_VERSION_MATRIX) }}
154-
db: ['mysql:5.7']
154+
db: ['mysql:8.0', 'mysql:8.1', 'mariadb:10.5']
155155
include:
156-
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
157-
db: 'mariadb:10.1'
158156
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
159157
db: 'mariadb:10.2'
160158
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
161159
db: 'mariadb:10.3'
162160
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
163161
db: 'mariadb:10.4'
164162
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
165-
db: 'mariadb:10.5'
163+
db: 'mariadb:10.6'
164+
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
165+
db: 'mariadb:10.9'
166+
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
167+
db: 'mariadb:10.10'
166168
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
167-
db: 'mysql:5.6'
169+
db: 'mariadb:10.11'
168170
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
169-
db: 'mysql:5.6'
171+
db: 'mysql:5.7'
170172
db_alias: 'MyISAM Tests'
171173
MYISAM: 1
172174
- php: ${{ startsWith(inputs.PRIMARY_PHP_VERSION, '7') && '7.4' || inputs.PRIMARY_PHP_VERSION }}
173-
db: 'mysql:8.0'
175+
db: 'mysql:5.7'
174176
COVERAGE: ${{ inputs.CODECOV == '1' && '1' || '0' }}
175-
db_alias: ${{ inputs.CODECOV == '1' && 'mysql:8.0 with Coverage' || 'mysql:8.0' }}
177+
db_alias: ${{ inputs.CODECOV == '1' && 'mysql:5.7 with Coverage' || 'mysql:5.7' }}
176178

177179
name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
178180

@@ -294,11 +296,11 @@ jobs:
294296
# START PostgreSQL Job
295297
postgres-tests:
296298
if: ${{ inputs.RUN_PGSQL_JOBS == '1' }}
297-
runs-on: ubuntu-lastest
299+
runs-on: ubuntu-latest
298300
strategy:
299301
matrix:
300302
php: ${{ fromJSON(inputs.PHP_VERSION_MATRIX) }}
301-
db: ['postgres:14']
303+
db: ['postgres:15']
302304
include:
303305
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
304306
db: 'postgres:9.5'
@@ -312,6 +314,8 @@ jobs:
312314
db: 'postgres:12'
313315
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
314316
db: 'postgres:13'
317+
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
318+
db: 'postgres:14'
315319

316320
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
317321

@@ -566,7 +570,7 @@ jobs:
566570
uses: shivammathur/setup-php@v2
567571
with:
568572
php-version: ${{ matrix.php }}
569-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql
573+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium
570574
ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }}
571575
coverage: none
572576

@@ -600,15 +604,17 @@ jobs:
600604
icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\cache" /grant Users:F /T
601605
icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\files" /grant Users:F /T
602606
icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\store" /grant Users:F /T
607+
icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\ext" /grant Users:F /T
608+
icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\vendor-ext" /grant Users:F /T
609+
icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\composer-ext.json" /grant Users:F /T
610+
icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\composer-ext.lock" /grant Users:F /T
603611
icacls "${env:GITHUB_WORKSPACE}\phpBB3\phpBB\images\avatars\upload" /grant Users:F /T
604612
$accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow")
605613
$acl = Get-ACL "${env:TEMP_DIR}"
606614
$acl.AddAccessRule($accessRule)
607615
Set-ACL -Path "${env:TEMP_DIR}" -ACLObject $acl
608616
cd ${env:GITHUB_WORKSPACE}\phpBB3\phpBB
609617
php ..\composer.phar install
610-
php ..\composer.phar remove phpunit/dbunit --dev --update-with-dependencies
611-
php ..\composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 doctrine/instantiator:^1.4 --dev --update-with-all-dependencies --ignore-platform-reqs
612618
cd ..
613619
614620
- name: Setup database

0 commit comments

Comments
 (0)